X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-mergetool--lib.sh;h=4db9212331259664732f031438b7b87b7a10244f;hb=c7fe5b61e15cc5195e33f7d5e5ec452e6966c1ad;hp=fb3f52ba2507b4fb78db150b5c183f24bd2c57c1;hpb=1eb71bc0ec609c67b8a308f9267691144a48bffd;p=git.git

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index fb3f52ba2..4db921233 100644
--- 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"