X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-mergetool--lib.sh;h=4db9212331259664732f031438b7b87b7a10244f;hb=dcf9c2e57ab8c916701dd1d4791ef479a3aaf1fc;hp=fb3f52ba2507b4fb78db150b5c183f24bd2c57c1;hpb=ad7bb2f68c0b7786521173e05ef58d0f3e0db3d7;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"