Datasetpublic

codekingpro/portable-devtools

sourceHugging Faceupdated 5mo agoView on Hugging Face

1likes14kdownloads

rootgitmingw64libexecgit-coremergetoolsdiffuse

diffuse24 linesDownload Raw Back to mergetools

1diff_cmd () {2	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat3}4 5diff_cmd_help () {6	echo "Use Diffuse (requires a graphical session)"7}8 9merge_cmd () {10	if $base_present11	then12		"$merge_tool_path" \13			"$LOCAL" "$MERGED" "$REMOTE" \14			"$BASE" | cat15	else16		"$merge_tool_path" \17			"$LOCAL" "$MERGED" "$REMOTE" | cat18	fi19}20 21merge_cmd_help () {22	echo "Use Diffuse (requires a graphical session)"23}24