Merge branch 'jc/fix-add-u-unmerged'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 18:01:15 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 18:01:15 +0000 (11:01 -0700)
* jc/fix-add-u-unmerged:
Fix "add -u" that sometimes fails to resolve unmerged paths

No differences found