diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-12 21:45:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-12 21:45:14 -0700 |
| commit | d9b04430d238be1fe75ef97e3455c65ca72a7fa0 (patch) | |
| tree | e9e0d7d1e46d47575302935f5a64bd1444c14152 /diff-no-index.c | |
| parent | 54e7e7891b75741ba745e783dd5c5f488f377438 (diff) | |
| parent | 4cc8d6c62db1f82b3c98468806d2ee54c7e037ca (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
Diffstat (limited to 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions