[Gnu-arch-users] Re: merge conflicts

[Matthieu Moy]

Zenaan Harkness <address@hidden> writes:

> I never realised from all the docs (-H, wiki, tut?) that this is what
> --three-way was for - I thought it was an extra special type of merge
> that would help me in bizzarre situations.

Actually, the kind of '<<<<<<<' markers left in the file are called
"diff3 markers", because this is the output of diff3 with the right
options.

That explains the documentation :-P

-- 
Matthieu