git-merge: Don't use -p when outputting summary
authorTimo Hirvonen <tihirvon@gmail.com>
Fri, 23 Jun 2006 21:45:40 +0000 (00:45 +0300)
committerJunio C Hamano <junkio@cox.net>
Sat, 24 Jun 2006 05:49:41 +0000 (22:49 -0700)
commit5e7c91d...f744dbf9a18152d2d49057aa3dd06160
treebbde6f5...2bc28952b6991f7ccbff67d3672f25aacopy hash to clipboard (tree)
parentcda8ab5...bbdb24b4ef87083781dac1f4f1b973a1copy hash to clipboard (diff)
git-merge.sh