blob: 74d03259fdf157c9ee07eec7b2c40727f5ce49dc [file] [log] [blame]
David Aguilar3e4f2372015-05-20 02:07:23 -07001diff_cmd () {
2 "$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
3 return 0
4}
5
6merge_cmd () {
7 # mergetool.winmerge.trustExitCode is implicitly false.
8 # touch $BACKUP so that we can check_unchanged.
David Aguilar3e4f2372015-05-20 02:07:23 -07009 "$merge_tool_path" -u -e -dl Local -dr Remote \
10 "$LOCAL" "$REMOTE" "$MERGED"
David Aguilar3e4f2372015-05-20 02:07:23 -070011}
12
13translate_merge_tool_path() {
Jacob Nisneviche36d7162016-03-25 16:17:56 -070014 mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
David Aguilar3e4f2372015-05-20 02:07:23 -070015}