Andrew's git / gitweb.git / blobdiff
?
stash: convert show to builtin
[gitweb.git] / t / t6042-merge-rename-corner-cases.sh
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 07dd09d985fad600c6f21d335ccfb30e3626db13..b97aca7fa263f79520013b14d90fa0b49031484b 100755 (executable)
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -323,7 +323,6 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
        (
                cd rename-directory-1 &&
 
-               git reset --hard &&
                git reset --hard &&
                git clean -fdqx &&