Merge branch 'jc/maint-merge-autoedit' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Apr 2012 19:56:35 +0000 (12:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Apr 2012 19:56:35 +0000 (12:56 -0700)
commitb52ab19d91015ebd6bebc83a82b2c3d64b948b36
tree56c03a113b6d6e5597f3e73ece62879c6268da45
parentb8939b2b3abaa99c18bf57251cd2828b89ac38c5
parentd387868a7d29621e85e8c5c061d1f50586db74e5
Merge branch 'jc/maint-merge-autoedit' into maint

* jc/maint-merge-autoedit:
  merge: backport GIT_MERGE_AUTOEDIT support