Fix "add -u" that sometimes fails to resolve unmerged paths
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Apr 2011 01:11:19 +0000 (18:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Apr 2011 06:13:28 +0000 (23:13 -0700)
commit75973b2...b58bf2b3038c5c214fc0a1b96d6868fe
tree0e87eaf...2131220184af67f945738157d706c58dcopy hash to clipboard (tree)
parent095ce95...8b738db28d5e9a6e05d94c7e3f55f39dcopy hash to clipboard (diff)
builtin/add.c
t/t2200-add-update.sh