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

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

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

Junio C Hamano committed Feb 3, 2009 at 00:26 UTC f39e4cfa2ec2bab4175cee3a9e806d8b65161c75

No changes.