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>
Elijah Newren committed
Aug 10, 2020 at 22:29 UTC
bc29dffe5987d0cff9fd012b5105daa4b1a535bf
1 file changed
+2
-1
t/t6418-merge-text-auto.sh
+2
-1
@@ -197,7 +197,8 @@ test_expect_success 'Test delete/normalize conflict' '
197
git commit -m "remove file" &&
198
git checkout master &&
199
git reset --hard a^ &&
200
- git merge side
200
+ git merge side &&
201
+ test_path_is_missing file
202
'
203
204
test_done