![[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) | ||
| commit | c672f01c0410eef621b0df3574bfcfe433139f04 | |
| tree | 7501d82636fa1d033eca28bd539fd94840c2c831 | tree | snapshot |
| parent | e2b1405b9445ad87f19625a3740eb802b3f7472f | commit | diff |
| parent | 6099835c1900876c813be6114ff4e81f6d90e8a3 | commit | diff |
Merge branch 'jc/want-commit'
* jc/want-commit:
Allow git merge ":/<pattern>"
* jc/want-commit:
Allow git merge ":/<pattern>"
| builtin/merge.c | diff1 | | diff2 | | blob | history |