diff options
Diffstat (limited to 't/t6031-merge-recursive.sh')
| -rwxr-xr-x | t/t6031-merge-recursive.sh | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index 6464a16a19..4053bd9fb7 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -53,35 +53,4 @@ test_expect_success FILEMODE 'verify executable bit on file' ' test -x file2 ' -test_expect_success 'merging with triple rename across D/F conflict' ' - git reset --hard HEAD && - git checkout -b main && - git rm -rf . && - - echo "just a file" >sub1 && - mkdir -p sub2 && - echo content1 >sub2/file1 && - echo content2 >sub2/file2 && - echo content3 >sub2/file3 && - mkdir simple && - echo base >simple/bar && - git add -A && - test_tick && - git commit -m base && - - git checkout -b other && - echo more >>simple/bar && - test_tick && - git commit -a -m changesimplefile && - - git checkout main && - git rm sub1 && - git mv sub2 sub1 && - test_tick && - git commit -m changefiletodir && - - test_tick && - git merge other -' - test_done |