Merge branch 'jc/want-commit'
commitc672f01c0410eef621b0df3574bfcfe433139f04
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:35:55 +0000 (5 12:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:35:55 +0000 (5 12:35 -0700)
tree7501d82636fa1d033eca28bd539fd94840c2c831
parente2b1405b9445ad87f19625a3740eb802b3f7472f
parent6099835c1900876c813be6114ff4e81f6d90e8a3
Merge branch 'jc/want-commit'

* jc/want-commit:
  Allow git merge ":/<pattern>"
builtin/merge.c