2 "$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
7 echo "Use WinMerge (requires a graphical session)"
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"
17 translate_merge_tool_path() {
18 mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
22 echo "Use WinMerge (requires a graphical session)"