Merge branch 'tr/merge-edit-guidance'

* tr/merge-edit-guidance: merge: add instructions to the commit message when editing

Junio C Hamano committed Jan 31, 2012 at 22:31 UTC 873ce7c8d5a57b5f8f3bcc8f9905dac13cb38988

No changes.