From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2011 17:52:16 +0000 (-0700)
Subject: Merge branch 'cj/p4merge'
X-Git-Tag: v1.7.6-rc0~98
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6c252ef79e314eef8fca862cca8a63329fa7591c?hp=2da61dcf9e678f36f8287b2cacdec2ebf014ae69

Merge branch 'cj/p4merge'

* 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 fb3f52ba25..4db9212331 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"