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>

diff --git a/git-merge.sh b/git-merge.sh
index af1f25b3c51d197ea5fd24b7623dfb591f867133..da5657eb40516430d0302eea2e15bac6fa699b55 100755 (executable)
--- 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
 }