commit | b52ab19d91015ebd6bebc83a82b2c3d64b948b36 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon Apr 02 12:56:35 2012 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Apr 02 12:56:35 2012 -0700 |
tree | 56c03a113b6d6e5597f3e73ece62879c6268da45 | |
parent | b8939b2b3abaa99c18bf57251cd2828b89ac38c5 [diff] | |
parent | d387868a7d29621e85e8c5c061d1f50586db74e5 [diff] |
Merge branch 'jc/maint-merge-autoedit' into maint * jc/maint-merge-autoedit: merge: backport GIT_MERGE_AUTOEDIT support