Merge branch 'jc/maint-merge-autoedit' into maint
* jc/maint-merge-autoedit: merge: backport GIT_MERGE_AUTOEDIT support
Junio C Hamano committed
Apr 2, 2012 at 12:56 UTC
b52ab19d91015ebd6bebc83a82b2c3d64b948b36
No changes.