PATH:
usr
/
libexec
/
git-core
/
mergetools
diff_cmd () { "$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE" } merge_cmd () { touch "$BACKUP" 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 check_unchanged }
[-] deltawalker
[edit]
[+]
..
[-] kompare
[edit]
[-] bc3
[edit]
[-] gvimdiff2
[edit]
[-] vimdiff2
[edit]
[-] vimdiff
[edit]
[-] kdiff3
[edit]
[-] ecmerge
[edit]
[-] codecompare
[edit]
[-] emerge
[edit]
[-] meld
[edit]
[-] araxis
[edit]
[-] gvimdiff
[edit]
[-] opendiff
[edit]
[-] xxdiff
[edit]
[-] tortoisemerge
[edit]
[-] diffuse
[edit]
[-] tkdiff
[edit]