summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/opendiff')
-rw-r--r--mergetools/opendiff2
1 files changed, 0 insertions, 2 deletions
diff --git a/mergetools/opendiff b/mergetools/opendiff
index 0942b2a733..b608dd6de3 100644
--- a/mergetools/opendiff
+++ b/mergetools/opendiff
@@ -3,7 +3,6 @@ diff_cmd () {
}
merge_cmd () {
- touch "$BACKUP"
if $base_present
then
"$merge_tool_path" "$LOCAL" "$REMOTE" \
@@ -12,5 +11,4 @@ merge_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-merge "$MERGED" | cat
fi
- check_unchanged
}