Merge branch 'ar/mergestat'
authorJunio C Hamano <junkio@cox.net>
Tue, 29 May 2007 07:38:52 +0000 (00:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 29 May 2007 07:38:52 +0000 (00:38 -0700)
* ar/mergestat:
  Add a configuration option to control diffstat after merge

1  2 
git-merge.sh

diff --cc git-merge.sh
Simple merge