PATH:
usr
/
libexec
/
git-core
/
mergetools
diff_cmd () { "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1 } diff_cmd_help () { echo "Use Araxis Merge (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" -wait -merge -3 -a1 \ "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 else "$merge_tool_path" -wait -2 \ "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 fi } merge_cmd_help () { echo "Use Araxis Merge (requires a graphical session)" } translate_merge_tool_path() { echo compare }
[-] kompare
[edit]
[-] smerge
[edit]
[+]
..
[-] diffmerge
[edit]
[-] bc
[edit]
[-] examdiff
[edit]
[-] opendiff
[edit]
[-] tortoisemerge
[edit]
[-] codecompare
[edit]
[-] guiffy
[edit]
[-] diffuse
[edit]
[-] tkdiff
[edit]
[-] deltawalker
[edit]
[-] emerge
[edit]
[-] meld
[edit]
[-] nvimdiff
[edit]
[-] winmerge
[edit]
[-] gvimdiff
[edit]
[-] kdiff3
[edit]
[-] xxdiff
[edit]
[-] vimdiff
[edit]
[-] araxis
[edit]
[-] ecmerge
[edit]