Merge branch 'jc/maint-add-u-remove-conflicted'
commitf39e4cfa2ec2bab4175cee3a9e806d8b65161c75
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Feb 2009 08:26:17 +0000 (3 00:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Feb 2009 08:26:17 +0000 (3 00:26 -0800)
tree080aa6dcd4d42ef5e4583b7ea84f33d97efd7c1f
parent1487eb68f7fd145151caa9a11ee00283629b75ef
parent4cc8d6c62db1f82b3c98468806d2ee54c7e037ca
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