From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2012 23:31:50 +0000 (-0800)
Subject: Merge branch 'tr/merge-edit-guidance' into maint
X-Git-Tag: v1.7.9.3~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4eed30a7cb56dfd21917a3685eccb1d8321d852f;p=git.git

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

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

4eed30a7cb56dfd21917a3685eccb1d8321d852f