![[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) |
* tr/merge-edit-guidance:
merge: add instructions to the commit message when editing
merge: add instructions to the commit message when editing
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/merge.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/merge.c
Simple merge