diff options
Diffstat (limited to 't/t6020-merge-df.sh')
| -rwxr-xr-x | t/t6020-merge-df.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh index 2af1bee..46b506b 100755 --- a/t/t6020-merge-df.sh +++ b/t/t6020-merge-df.sh @@ -89,9 +89,6 @@ test_expect_success 'modify/delete + directory/file conflict' ' ' test_expect_success 'modify/delete + directory/file conflict; other way' ' - # Yes, we really need the double reset since "letters" appears as - # both a file and a directory. - git reset --hard && git reset --hard && git clean -f && git checkout modify^0 && |