diff options
| -rwxr-xr-x | t/t6406-merge-attr.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6406-merge-attr.sh b/t/t6406-merge-attr.sh index b50aedbc00..9677180a5b 100755 --- a/t/t6406-merge-attr.sh +++ b/t/t6406-merge-attr.sh @@ -168,7 +168,7 @@ test_expect_success 'custom merge backend' ' rm -f $o $a $b ' -test_expect_success 'custom merge driver that is killed with a signal' ' +test_expect_success !WINDOWS 'custom merge driver that is killed with a signal' ' test_when_finished "rm -f output please-abort" && git reset --hard anchor && |