PATH:
usr
/
lib
/
git-core
/
mergetools
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } merge_cmd () { if test -z "${meld_has_output_option:+set}" then check_meld_for_output_version fi if test "$meld_has_output_option" = true then "$merge_tool_path" --output="$MERGED" \ "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" fi } # Check whether we should use 'meld --output <file>' check_meld_for_output_version () { meld_path="$(git config mergetool.meld.path)" meld_path="${meld_path:-meld}" if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput) then : use configured value elif "$meld_path" --help 2>&1 | grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null then : old ones mention --output and new ones just say OPTION... meld_has_output_option=true else meld_has_output_option=false fi }
[-] emerge
[edit]
[-] guiffy
[edit]
[-] vimdiff
[edit]
[-] kompare
[edit]
[-] meld
[edit]
[-] smerge
[edit]
[-] tortoisemerge
[edit]
[-] xxdiff
[edit]
[-] diffuse
[edit]
[-] vimdiff3
[edit]
[-] diffmerge
[edit]
[-] examdiff
[edit]
[-] ecmerge
[edit]
[-] bc3
[edit]
[-] kdiff3
[edit]
[-] gvimdiff
[edit]
[+]
..
[-] deltawalker
[edit]
[-] p4merge
[edit]
[-] gvimdiff2
[edit]
[-] codecompare
[edit]
[-] vimdiff2
[edit]
[-] bc
[edit]
[-] gvimdiff3
[edit]
[-] tkdiff
[edit]
[-] winmerge
[edit]
[-] opendiff
[edit]
[-] araxis
[edit]