diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-12 09:19:34 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-15 01:19:31 +0400 |
| commit | 695576fddd039b2fdc3cad52bbaab4d89e27b71c (patch) | |
| tree | ed49ce8831903fdc7060a7e73871e422a924c4ae /t/t6036-recursive-corner-cases.sh | |
| parent | d8ead15963890a42f99fd0e7f3192b55cacd9404 (diff) | |
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/t6036-recursive-corner-cases.sh')
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 871577d90c..319b6fa417 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='recursive merge corner cases' +test_description='recursive merge corner cases involving criss-cross merges' . ./test-lib.sh |