![[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) |
* jc/maint-merge-autoedit:
merge: backport GIT_MERGE_AUTOEDIT support
merge: backport GIT_MERGE_AUTOEDIT support
Trivial merge