![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Feb 2009 08:26:17 +0000 (00:26 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Feb 2009 08:26:17 +0000 (00:26 -0800) | ||
| commit | f39e4cfa2ec2bab4175cee3a9e806d8b65161c75 | |
| tree | 080aa6dcd4d42ef5e4583b7ea84f33d97efd7c1f | tree | snapshot |
| parent | 1487eb68f7fd145151caa9a11ee00283629b75ef | commit | diff |
| parent | 4cc8d6c62db1f82b3c98468806d2ee54c7e037ca | commit | diff |
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
* jc/maint-add-u-remove-conflicted:
add -u: do not fail to resolve a path as deleted