2 "$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
7 # mergetool.winmerge.trustExitCode is implicitly false.
8 # touch $BACKUP so that we can check_unchanged.
9 "$merge_tool_path" -u -e -dl Local -dr Remote \
10 "$LOCAL" "$REMOTE" "$MERGED"
13 translate_merge_tool_path() {
14 mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"