Datasetpublic

codekingpro/portable-devtools

sourceHugging Faceupdated 5mo agoView on Hugging Face

1likes14kdownloads

rootgitmingw64libexecgit-coremergetoolstkdiff

tkdiff25 linesDownload Raw Back to mergetools

1diff_cmd () {2	"$merge_tool_path" "$LOCAL" "$REMOTE"3}4 5diff_cmd_help () {6	echo "Use TkDiff (requires a graphical session)"7}8 9merge_cmd () {10	if $base_present11	then12		"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"13	else14		"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"15	fi16}17 18exit_code_trustable () {19	true20}21 22merge_cmd_help () {23	echo "Use TkDiff (requires a graphical session)"24}25