![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Feb 2012 23:31:50 +0000 (15:31 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Feb 2012 23:31:50 +0000 (15:31 -0800) | ||
| commit | 4eed30a7cb56dfd21917a3685eccb1d8321d852f | |
| tree | fe0f1e322a72cc805d11b93e628ecf0ba8db9d5c | tree | snapshot |
| parent | 860f70f9f4206379361fd5af84c8fde31984b418 | commit | diff |
| parent | f26af3fcbcbd27392b8c94b1e4eb6e671b2466ab | commit | diff |
Merge branch 'tr/merge-edit-guidance' into maint
* 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 |