![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Feb 2012 06:31:03 +0000 (22:31 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Feb 2012 06:31:03 +0000 (22:31 -0800) | ||
| commit | 873ce7c8d5a57b5f8f3bcc8f9905dac13cb38988 | |
| tree | 1a111a51469d2262add23f2dcbba7c644f1ac474 | tree | snapshot |
| parent | af6b37fab1a97943c804f4983452c7fde5b0fbbe | commit | diff |
| parent | f26af3fcbcbd27392b8c94b1e4eb6e671b2466ab | commit | diff |
Merge branch 'tr/merge-edit-guidance'
* tr/merge-edit-guidance:
merge: add instructions to the commit message when editing
* tr/merge-edit-guidance:
merge: add instructions to the commit message when editing
| builtin/merge.c | diff1 | | diff2 | | blob | history |