Merge branch 'tr/merge-edit-guidance'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:31:03 +0000 (22:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:31:03 +0000 (22:31 -0800)
commit873ce7c8d5a57b5f8f3bcc8f9905dac13cb38988
tree1a111a51469d2262add23f2dcbba7c644f1ac474
parentaf6b37fab1a97943c804f4983452c7fde5b0fbbe
parentf26af3fcbcbd27392b8c94b1e4eb6e671b2466ab
Merge branch 'tr/merge-edit-guidance'

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