X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=af1f25b3c51d197ea5fd24b7623dfb591f867133;hb=fd7e9fb7ae206a64b87c7faecfc88716e98a7577;hp=78ab422e4ef294d8bcffba91bb7e2116e381d98e;hpb=8ff8eea016f27d22d0264b140843470c7f14e004;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 78ab422e..af1f25b3 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -55,8 +55,7 @@ finish () {
 
 	case "$no_summary" in
 	'')
-		git-diff-tree -p -M "$head" "$1" |
-		git-apply --stat --summary
+		git-diff-tree -p --stat --summary -M "$head" "$1"
 		;;
 	esac
 }
@@ -335,5 +334,5 @@ Conflicts:
 	then
 		git-rerere
 	fi
-	die "Automatic merge failed; fix up by hand"
+	die "Automatic merge failed; fix conflicts and then commit the result."
 fi