Merge branch 'jc/fix-add-u-unmerged'
* jc/fix-add-u-unmerged: Fix "add -u" that sometimes fails to resolve unmerged paths
Junio C Hamano committed
May 13, 2011 at 11:01 UTC
f7d59e256884f63adeed9a1f3376a386a28681ff
No changes.