![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Apr 2012 19:56:35 +0000 (12:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Apr 2012 19:56:35 +0000 (12:56 -0700) | ||
| commit | b52ab19d91015ebd6bebc83a82b2c3d64b948b36 | |
| tree | 56c03a113b6d6e5597f3e73ece62879c6268da45 | tree | snapshot |
| parent | b8939b2b3abaa99c18bf57251cd2828b89ac38c5 | commit | diff |
| parent | d387868a7d29621e85e8c5c061d1f50586db74e5 | commit | diff |
Merge branch 'jc/maint-merge-autoedit' into maint
* jc/maint-merge-autoedit:
merge: backport GIT_MERGE_AUTOEDIT support
* jc/maint-merge-autoedit:
merge: backport GIT_MERGE_AUTOEDIT support