![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Oct 2011 19:35:55 +0000 (12:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Oct 2011 19:35:55 +0000 (12:35 -0700) |
* jc/want-commit:
Allow git merge ":/<pattern>"
Allow git merge ":/<pattern>"
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/merge.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/merge.c
Simple merge