Re: [Gnu-arch-users] Re: <<< conflict markers

[Stefan Monnier]

> I want changeset-application-with-conflicts to be cleanly composable
> and somewhat decomposable.

If we only consider diff3 markers, this works fine in 99% of the cases.
The only cases where it might result in ambiguous results is if you merge
two trees which both have conflict markers at the same place in a file.


        Stefan