Merge branch 'jc/want-commit'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:35:55 +0000 (12:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 19:35:55 +0000 (12:35 -0700)
* jc/want-commit:
  Allow git merge ":/<pattern>"

1  2 
builtin/merge.c

diff --cc builtin/merge.c
Simple merge