[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Stefan Monnier
Subject: Re: [Gnu-arch-users] Re: <<< conflict markers
Date: 15 Apr 2004 09:23:25 -0400
User-agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50

> 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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]