summaryrefslogtreecommitdiff
path: root/mergetools/bc
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/bc')
-rw-r--r--mergetools/bc2
1 files changed, 0 insertions, 2 deletions
diff --git a/mergetools/bc b/mergetools/bc
index b6319d206e..3a69e60faa 100644
--- a/mergetools/bc
+++ b/mergetools/bc
@@ -3,7 +3,6 @@ diff_cmd () {
}
merge_cmd () {
- touch "$BACKUP"
if $base_present
then
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
@@ -12,7 +11,6 @@ merge_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-mergeoutput="$MERGED"
fi
- check_unchanged
}
translate_merge_tool_path() {