From: Elijah Newren via GitGitGadget Date: Sat, 08 Aug 2020 17:01:11 GMT Subject: [PATCH v2 02/11] t6418: tighten delete/normalize conflict testcase Message-ID: <621c9a159ef6e64a5fd6b6fdcac01c0c7aa57d4b.1596906081.git.gitgitgadget@gmail.com> In-Reply-To: From: Elijah Newren 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 --- t/t6418-merge-text-auto.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t6418-merge-text-auto.sh b/t/t6418-merge-text-auto.sh index 5e8d5fa50c..517f7a450d 100755 --- a/t/t6418-merge-text-auto.sh +++ b/t/t6418-merge-text-auto.sh @@ -211,7 +211,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 -- gitgitgadget