diff options
| -rwxr-xr-x | t/t6026-merge-attr.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index 03d13d00b5..2672b15aa3 100755 --- a/t/t6026-merge-attr.sh +++ b/t/t6026-merge-attr.sh @@ -193,8 +193,7 @@ test_expect_success 'custom merge does not lock index' ' "* merge=ours" "text merge=sleep-one-second" && test_config merge.ours.driver true && test_config merge.sleep-one-second.driver ./sleep-one-second.sh && - git merge master && - test -f sleep.pid + git merge master ' test_done |