golden hour

/usr/libexec/git-core/mergetools

⬆️ Go Up

Upload

File/Folder	Size	Actions
araxis	515 B	Del OK
bc	584 B	Del OK
codecompare	510 B	Del OK
deltawalker	818 B	Del OK
diffmerge	460 B	Del OK
diffuse	395 B	Del OK
ecmerge	453 B	Del OK
emerge	535 B	Del OK
examdiff	493 B	Del OK
guiffy	432 B	Del OK
gvimdiff	29 B	Del OK
kdiff3	818 B	Del OK
kompare	264 B	Del OK
meld	2.16 KB	Del OK
nvimdiff	29 B	Del OK
opendiff	418 B	Del OK
smerge	423 B	Del OK
tkdiff	403 B	Del OK
tortoisemerge	761 B	Del OK
vimdiff	17.23 KB	Del OK
vscode	373 B	Del OK
winmerge	510 B	Del OK
xxdiff	913 B	Del OK

Edit: codecompare

diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } diff_cmd_help () { echo "Use Code Compare (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \ -RF="$MERGED" else "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \ -RF="$MERGED" fi } merge_cmd_help () { echo "Use Code Compare (requires a graphical session)" } translate_merge_tool_path() { if merge_mode then echo CodeMerge else echo CodeCompare fi }
Save