git-merge: Don't use -p when outputting summary
commit5e7c91d6f744dbf9a18152d2d49057aa3dd06160
authorTimo Hirvonen <tihirvon@gmail.com>
Fri, 23 Jun 2006 21:45:40 +0000 (24 00:45 +0300)
committerJunio C Hamano <junkio@cox.net>
Sat, 24 Jun 2006 05:49:41 +0000 (23 22:49 -0700)
treebbde6f532bc28952b6991f7ccbff67d3672f25aa
parentcda8ab59bbdb24b4ef87083781dac1f4f1b973a1
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-merge.sh