Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
sequencer: lib'ify checkout_fast_forward()
[gitweb.git]
/
t
/
t6026-merge-attr.sh
diff --git
a/t/t6026-merge-attr.sh
b/t/t6026-merge-attr.sh
index 3d28c786878b385a09c72ed23836a5e6e1fece78..dd8f88d18782f15e35aa3105668d9a713ba9fe3b 100755
(executable)
--- a/
t/t6026-merge-attr.sh
+++ b/
t/t6026-merge-attr.sh
@@
-181,7
+181,7
@@
test_expect_success 'up-to-date merge without common ancestor' '
)
'
-test_expect_success
!MINGW
'custom merge does not lock index' '
+test_expect_success 'custom merge does not lock index' '
git reset --hard anchor &&
write_script sleep-one-second.sh <<-\EOF &&
sleep 1 &