![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 Mar 2009 04:45:14 +0000 (21:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 Mar 2009 04:45:14 +0000 (21:45 -0700) |
* jc/maint-1.6.1-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