diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-07 14:33:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-07 14:33:14 -0700 |
| commit | 0f3d66c6dc0c6915888fbf928de0ae22739abc70 (patch) | |
| tree | 6d9ef01cc818a63d7001c06cc305c4a326787926 /fast-import.c | |
| parent | Merge branch 'tb/shared-perm' (diff) | |
| parent | t3600: document failure of rm across symbolic links (diff) | |
| download | tgif-0f3d66c6dc0c6915888fbf928de0ae22739abc70.tar.xz | |
Merge branch 'jk/rm-removed-paths'
A handful of test cases and a corner case bugfix for "git rm".
* jk/rm-removed-paths:
t3600: document failure of rm across symbolic links
t3600: test behavior of reverse-d/f conflict
rm: do not complain about d/f conflicts during deletion
Diffstat (limited to 'fast-import.c')
0 files changed, 0 insertions, 0 deletions