diff options
| author | Elijah Newren <newren@gmail.com> | 2020-08-10 22:29:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-10 22:59:00 (GMT) |
| commit | bc29dffe5987d0cff9fd012b5105daa4b1a535bf (patch) | |
| tree | 8b0f63bf629fb43f457937f1a242756c33ad7fe5 /t/t6418-merge-text-auto.sh | |
| parent | 919df3195553af05c884d51588d12134d8dfab2a (diff) | |
| download | git-bc29dffe5987d0cff9fd012b5105daa4b1a535bf.zip git-bc29dffe5987d0cff9fd012b5105daa4b1a535bf.tar.gz git-bc29dffe5987d0cff9fd012b5105daa4b1a535bf.tar.bz2 | |
t6418: tighten delete/normalize conflict testcase
The testcase only required that the merge complete without conflict,
without specifying what the correct resolution was. Since normalization
changed this from a modify/delete to a not-modified/delete, the correct
resolution is to have the file be removed at the end. Add a check for
this resolution.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6418-merge-text-auto.sh')
| -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 89c86d4..30983d1 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 |