PATH:
usr
/
libexec
/
git-core
/
mergetools
diff_cmd () { "$merge_tool_path" -u -e "$LOCAL" "$REMOTE" return 0 } diff_cmd_help () { echo "Use WinMerge (requires a graphical session)" } merge_cmd () { # mergetool.winmerge.trustExitCode is implicitly false. # touch $BACKUP so that we can check_unchanged. "$merge_tool_path" -u -e -dl Local -dr Remote \ "$LOCAL" "$REMOTE" "$MERGED" } translate_merge_tool_path() { mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge" } merge_cmd_help () { echo "Use WinMerge (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]