diff options
Diffstat (limited to 'mergetools/winmerge')
| -rw-r--r-- | mergetools/winmerge | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mergetools/winmerge b/mergetools/winmerge index f3819d3..74d0325 100644 --- a/mergetools/winmerge +++ b/mergetools/winmerge @@ -6,10 +6,8 @@ diff_cmd () { merge_cmd () { # mergetool.winmerge.trustExitCode is implicitly false. # touch $BACKUP so that we can check_unchanged. - touch "$BACKUP" "$merge_tool_path" -u -e -dl Local -dr Remote \ "$LOCAL" "$REMOTE" "$MERGED" - check_unchanged } translate_merge_tool_path() { |