summaryrefslogtreecommitdiff
path: root/mergetools/examdiff
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/examdiff')
-rw-r--r--mergetools/examdiff2
1 files changed, 0 insertions, 2 deletions
diff --git a/mergetools/examdiff b/mergetools/examdiff
index 7b524d4088..e72b06fc4d 100644
--- a/mergetools/examdiff
+++ b/mergetools/examdiff
@@ -3,14 +3,12 @@ diff_cmd () {
}
merge_cmd () {
- touch "$BACKUP"
if $base_present
then
"$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
else
"$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
fi
- check_unchanged
}
translate_merge_tool_path() {