Merge branch 'cj/p4merge' into maint

* cj/p4merge:
  Pass empty file to p4merge where no base is suitable.

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index fb3f52ba2507b4fb78db150b5c183f24bd2c57c1..4db9212331259664732f031438b7b87b7a10244f 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -258,12 +258,9 @@ run_merge_tool () {
                ;;
        p4merge)
                if merge_mode; then
-                   touch "$BACKUP"
-                       if $base_present; then
-                               "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
-                       else
-                               "$merge_tool_path" "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
-                       fi
+                       touch "$BACKUP"
+                       $base_present || >"$BASE"
+                       "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
                        check_unchanged
                else
                        "$merge_tool_path" "$LOCAL" "$REMOTE"