]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 919df31) | patch
t6418: tighten delete/normalize conflict testcase
authorElijah Newren <newren@gmail.com>
Mon, 10 Aug 2020 22:29:10 +0000 (22:29 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Aug 2020 22:59:00 +0000 (15:59 -0700)
commitbc29dffe5987d0cff9fd012b5105daa4b1a535bf
tree8b0f63bf629fb43f457937f1a242756c33ad7fe5tree | snapshot
parent919df3195553af05c884d51588d12134d8dfab2acommit | diff
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>
t/t6418-merge-text-auto.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.