Merge branch 'tr/merge-edit-guidance' into maint

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

Junio C Hamano committed Feb 27, 2012 at 15:31 UTC 4eed30a7cb56dfd21917a3685eccb1d8321d852f

No changes.