Merge branch 'tr/merge-edit-guidance' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 23:31:50 +0000 (15:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 23:31:50 +0000 (15:31 -0800)
commit4eed30a7cb56dfd21917a3685eccb1d8321d852f
treefe0f1e322a72cc805d11b93e628ecf0ba8db9d5c
parent860f70f9f4206379361fd5af84c8fde31984b418
parentf26af3fcbcbd27392b8c94b1e4eb6e671b2466ab
Merge branch 'tr/merge-edit-guidance' into maint

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