| 1 | diff_cmd () { |
| 2 | "$merge_tool_path" -u -e "$LOCAL" "$REMOTE" |
| 3 | return 0 |
| 4 | } |
| 5 | |
| 6 | diff_cmd_help () { |
| 7 | echo "Use WinMerge (requires a graphical session)" |
| 8 | } |
| 9 | |
| 10 | merge_cmd () { |
| 11 | # mergetool.winmerge.trustExitCode is implicitly false. |
| 12 | # touch $BACKUP so that we can check_unchanged. |
| 13 | "$merge_tool_path" -u -e -dl Local -dr Remote \ |
| 14 | "$LOCAL" "$REMOTE" "$MERGED" |
| 15 | } |
| 16 | |
| 17 | translate_merge_tool_path() { |
| 18 | mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge" |
| 19 | } |
| 20 | |
| 21 | merge_cmd_help () { |
| 22 | echo "Use WinMerge (requires a graphical session)" |
| 23 | } |