1diff_cmd () {
2"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
3return 0
4}
56
merge_cmd () {
7# mergetool.winmerge.trustExitCode is implicitly false.
8# touch $BACKUP so that we can check_unchanged.
9touch "$BACKUP"
10"$merge_tool_path" -u -e -dl Local -dr Remote \
11"$LOCAL" "$REMOTE" "$MERGED"
12check_unchanged
13}
1415
translate_merge_tool_path() {
16mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
17}