Merge branch 'cj/p4merge' into maint

* cj/p4merge: Pass empty file to p4merge where no base is suitable.
git-mirror · May 13, 2011 · e82c746 · e82c746
2 parents 8272bca + 0a0ec7b
commit e82c746
Showing 1 changed file with 3 additions and 6 deletions.
diff --git 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"