Merge branch 'ar/mergestat'
commit8250465859644eee5db3c1169db689beca65a868
authorJunio C Hamano <junkio@cox.net>
Tue, 29 May 2007 07:38:52 +0000 (29 00:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 29 May 2007 07:38:52 +0000 (29 00:38 -0700)
tree44825f673b9676adeed70410ceed1f043175083a
parent9953a00ef26386e16bc12d10669f41596c8ab3c6
parent51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9
Merge branch 'ar/mergestat'

* ar/mergestat:
  Add a configuration option to control diffstat after merge
git-merge.sh