PATH:
usr
/
libexec
/
git-core
/
mergetools
can_diff () { return 1 } diff_cmd_help () { echo "Use TortoiseMerge (requires a graphical session)" } merge_cmd () { if $base_present then basename="$(basename "$merge_tool_path" .exe)" if test "$basename" = "tortoisegitmerge" then "$merge_tool_path" \ -base "$BASE" -mine "$LOCAL" \ -theirs "$REMOTE" -merged "$MERGED" else "$merge_tool_path" \ -base:"$BASE" -mine:"$LOCAL" \ -theirs:"$REMOTE" -merged:"$MERGED" fi else echo "$merge_tool_path cannot be used without a base" 1>&2 return 1 fi } translate_merge_tool_path() { if type tortoisegitmerge >/dev/null 2>/dev/null then echo tortoisegitmerge else echo tortoisemerge fi } merge_cmd_help () { echo "Use TortoiseMerge (requires a graphical session)" }
[-] winmerge
[edit]
[-] deltawalker
[edit]
[-] tkdiff
[edit]
[-] bc
[edit]
[-] nvimdiff
[edit]
[-] tortoisemerge
[edit]
[-] xxdiff
[edit]
[-] codecompare
[edit]
[-] vimdiff
[edit]
[-] kompare
[edit]
[+]
..
[-] diffmerge
[edit]
[-] kdiff3
[edit]
[-] guiffy
[edit]
[-] diffuse
[edit]
[-] examdiff
[edit]
[-] ecmerge
[edit]
[-] smerge
[edit]
[-] opendiff
[edit]
[-] araxis
[edit]
[-] meld
[edit]
[-] emerge
[edit]
[-] gvimdiff
[edit]