t6111: allow checking the parents as well

diff --git a/mergetools/p4merge b/mergetools/p4merge
index 46b3a5a4ff378fad198a5dd518ff7969841b22b7..5a608abf9c77f436ab1472592e3d5777ef83805d 100644 (file)
--- a/mergetools/p4merge
+++ b/mergetools/p4merge
@@ -21,7 +21,11 @@ diff_cmd () {
 
 merge_cmd () {
        touch "$BACKUP"
-       $base_present || >"$BASE"
+       if ! $base_present
+       then
+               cp -- "$LOCAL" "$BASE"
+               create_virtual_base "$BASE" "$REMOTE"
+       fi
        "$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
        check_unchanged
 }