summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/p4merge')
-rw-r--r--mergetools/p4merge2
1 files changed, 0 insertions, 2 deletions
diff --git a/mergetools/p4merge b/mergetools/p4merge
index 5a608abf9c..7a5b291dd2 100644
--- a/mergetools/p4merge
+++ b/mergetools/p4merge
@@ -20,14 +20,12 @@ diff_cmd () {
}
merge_cmd () {
- touch "$BACKUP"
if ! $base_present
then
cp -- "$LOCAL" "$BASE"
create_virtual_base "$BASE" "$REMOTE"
fi
"$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
- check_unchanged
}
create_empty_file () {