t6036: avoid non-portable "cp -a"
[gitweb.git] / t / t6036-recursive-corner-cases.sh
index b7488b00c04526e938a2c0fe2937ce04fbdc4640..d23b948f27f13ec81dd40fb52caa2ea4b5b8500c 100755 (executable)
@@ -1631,7 +1631,7 @@ test_expect_success 'check nested conflicts' '
 
                # Compare m to expected contents
                >empty &&
-               cp -a m_stage_2 expected_final_m &&
+               cp m_stage_2 expected_final_m &&
                test_must_fail git merge-file --diff3 \
                        -L "HEAD"                     \
                        -L "merged common ancestors"  \