Skip to content
Snippets Groups Projects
Commit c19c662097e1 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

copies: detect case when a merge decision overwrite previous data

We now detect and record when a merge case required special logic (eg: thing
that append during the merge, ambiguity leading to picking p1 data, etc) and we
explicitly mark the result as superseding the previous data.

This fixes the family of test we previously added.

Differential Revision: https://phab.mercurial-scm.org/D9613
parent c692384bb559
No related branches found
No related tags found
1 merge request!72ci: hook network-io tests into the pipeline
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment