![[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) |
* jc/maint-add-u-remove-conflicted:
add -u: do not fail to resolve a path as deleted
add -u: do not fail to resolve a path as deleted
Trivial merge