Merge branch 'jc/fix-add-u-unmerged' into maint
* jc/fix-add-u-unmerged: Fix "add -u" that sometimes fails to resolve unmerged paths Conflicts: builtin/add.c
Junio C Hamano committed
May 16, 2011 at 16:37 UTC
90e8b9b23dff20946a0eacdf8abedce7e32c1d78
No changes.