diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6418-merge-text-auto.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t6418-merge-text-auto.sh b/t/t6418-merge-text-auto.sh index 89c86d4e56..30983d18b1 100755 --- a/t/t6418-merge-text-auto.sh +++ b/t/t6418-merge-text-auto.sh @@ -197,7 +197,8 @@ test_expect_success 'Test delete/normalize conflict' ' git commit -m "remove file" && git checkout master && git reset --hard a^ && - git merge side + git merge side && + test_path_is_missing file ' test_done |