![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 29 May 2007 07:38:52 +0000 (00:38 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 29 May 2007 07:38:52 +0000 (00:38 -0700) | ||
| commit | 8250465859644eee5db3c1169db689beca65a868 | |
| tree | 44825f673b9676adeed70410ceed1f043175083a | tree | snapshot |
| parent | 9953a00ef26386e16bc12d10669f41596c8ab3c6 | commit | diff |
| parent | 51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9 | commit | diff |
Merge branch 'ar/mergestat'
* ar/mergestat:
Add a configuration option to control diffstat after merge
* ar/mergestat:
Add a configuration option to control diffstat after merge
| git-merge.sh | diff1 | | diff2 | | blob | history |