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