diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:34 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:31 -0700 |
| commit | 695576fddd039b2fdc3cad52bbaab4d89e27b71c (patch) | |
| tree | ed49ce8831903fdc7060a7e73871e422a924c4ae /t/lib-cvs.sh | |
| parent | fetch: do not leak a refspec (diff) | |
| download | tgif-695576fddd039b2fdc3cad52bbaab4d89e27b71c.tar.xz | |
t6042: Add a testcase where git deletes an untracked file
Current git will nuke an untracked file during a rename/delete conflict if
(a) there is an untracked file whose name matches the source of a rename
and (b) the merge is done in a certain direction. Add a simple testcase
demonstrating this bug.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-cvs.sh')
0 files changed, 0 insertions, 0 deletions