![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Mar 2011 23:47:25 +0000 (16:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Mar 2011 23:47:25 +0000 (16:47 -0700) |
* js/maint-merge-use-prepare-commit-msg-hook:
merge: honor prepare-commit-msg hook
merge: honor prepare-commit-msg hook
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/merge.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/merge.c
Simple merge