diff options
Diffstat (limited to 'mergetools/meld')
| -rw-r--r-- | mergetools/meld | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mergetools/meld b/mergetools/meld index 83ebdfb4c3..bc178e8882 100644 --- a/mergetools/meld +++ b/mergetools/meld @@ -7,7 +7,7 @@ merge_cmd () { then check_meld_for_output_version fi - touch "$BACKUP" + if test "$meld_has_output_option" = true then "$merge_tool_path" --output "$MERGED" \ @@ -15,7 +15,6 @@ merge_cmd () { else "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" fi - check_unchanged } # Check whether we should use 'meld --output <file>' |