PATH:
usr
/
libexec
/
git-core
/
mergetools
diff_cmd () { "$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE" } diff_cmd_help () { echo "Use ECMerge (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \ --default --mode=merge3 --to="$MERGED" else "$merge_tool_path" "$LOCAL" "$REMOTE" \ --default --mode=merge2 --to="$MERGED" fi } merge_cmd_help () { echo "Use ECMerge (requires a graphical session)" }
[-] diffmerge
[open]
[-] xxdiff
[open]
[-] kompare
[open]
[-] diffuse
[open]
[-] gvimdiff
[open]
[+]
..
[-] examdiff
[open]
[-] tortoisemerge
[open]
[-] vscode
[open]
[-] deltawalker
[open]
[-] meld
[open]
[-] opendiff
[open]
[-] ecmerge
[open]
[-] codecompare
[open]
[-] kdiff3
[open]
[-] araxis
[open]
[-] vimdiff
[open]
[-] emerge
[open]
[-] tkdiff
[open]
[-] smerge
[open]
[-] guiffy
[open]
[-] bc
[open]
[-] winmerge
[open]
[-] nvimdiff
[open]