git-merge: Don't use -p when outputting summary

-p is not needed and we only want diffstat and summary. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
git-mirror · Jun 24, 2006 · 5e7c91d · 5e7c91d
1 parent cda8ab5
commit 5e7c91d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git-merge.sh b/git-merge.sh
@@ -55,7 +55,7 @@ finish () {
 
 	case "$no_summary" in
 	'')
-		git-diff-tree -p --stat --summary -M "$head" "$1"
+		git-diff-tree --stat --summary -M "$head" "$1"
 		;;
 	esac
 }