@matheusbsbs / matheus-bagliano / commits / d9b04430d2
Fork 0

Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1

* jc/maint-1.6.1-add-u-remove-conflicted: add -u: do not fail to resolve a path as deleted

Junio C Hamano committed Mar 12, 2009 at 21:45 UTC d9b04430d238be1fe75ef97e3455c65ca72a7fa0

No changes.