![[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) | ||
| commit | d9b04430d238be1fe75ef97e3455c65ca72a7fa0 | |
| tree | e9e0d7d1e46d47575302935f5a64bd1444c14152 | tree | snapshot |
| parent | 54e7e7891b75741ba745e783dd5c5f488f377438 | commit | diff |
| parent | 4cc8d6c62db1f82b3c98468806d2ee54c7e037ca | commit | diff |
Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1
* jc/maint-1.6.1-add-u-remove-conflicted:
add -u: do not fail to resolve a path as deleted
* jc/maint-1.6.1-add-u-remove-conflicted:
add -u: do not fail to resolve a path as deleted