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>
This commit is contained in:
Timo Hirvonen 2006-06-24 00:45:40 +03:00 committed by Junio C Hamano
parent cda8ab59bb
commit 5e7c91d6f7

View file

@ -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
}