diff options
| author | Elijah Newren <newren@gmail.com> | 2020-08-10 22:29:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-10 15:59:00 -0700 |
| commit | bc29dffe5987d0cff9fd012b5105daa4b1a535bf (patch) | |
| tree | 8b0f63bf629fb43f457937f1a242756c33ad7fe5 /commit-graph.c | |
| parent | Collect merge-related tests to t64xx (diff) | |
| download | git-bc29dffe5987d0cff9fd012b5105daa4b1a535bf.tar.gz git-bc29dffe5987d0cff9fd012b5105daa4b1a535bf.zip | |
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 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions