David Aguilar | 3e4f237 | 2015-05-20 02:07:23 -0700 | [diff] [blame] | 1 | diff_cmd () { |
| 2 | "$merge_tool_path" -u -e "$LOCAL" "$REMOTE" |
| 3 | return 0 |
| 4 | } |
| 5 | |
| 6 | merge_cmd () { |
| 7 | # mergetool.winmerge.trustExitCode is implicitly false. |
| 8 | # touch $BACKUP so that we can check_unchanged. |
David Aguilar | 3e4f237 | 2015-05-20 02:07:23 -0700 | [diff] [blame] | 9 | "$merge_tool_path" -u -e -dl Local -dr Remote \ |
| 10 | "$LOCAL" "$REMOTE" "$MERGED" |
David Aguilar | 3e4f237 | 2015-05-20 02:07:23 -0700 | [diff] [blame] | 11 | } |
| 12 | |
| 13 | translate_merge_tool_path() { |
Jacob Nisnevich | e36d716 | 2016-03-25 16:17:56 -0700 | [diff] [blame] | 14 | mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge" |
David Aguilar | 3e4f237 | 2015-05-20 02:07:23 -0700 | [diff] [blame] | 15 | } |