From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 1 Feb 2012 06:31:03 +0000 (-0800)
Subject: Merge branch 'tr/merge-edit-guidance'
X-Git-Tag: v1.7.10-rc0~122
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=873ce7c8d5a57b5f8f3bcc8f9905dac13cb38988;p=git.git

Merge branch 'tr/merge-edit-guidance'

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

873ce7c8d5a57b5f8f3bcc8f9905dac13cb38988