Comment 2 for bug 191402

On Wed, Feb 13, 2008 at 07:36:29AM -0000, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Cameron wrote:
> > Public bug reported:
> >
> > I had a conflict in a file that had the string ===================== in
> > it.
>
> That string, like <<<<<<< and >>>>>>>, is a conflict marker.
>

Yeah, that's what I eventually guessed. The problem was that I didn't
see anything in the documentation that suggested the resolver would
fail if that particular string was encountered. It's a corner case,
but not an obvious gotcha. My file was quite small, but imagine a
large file in which the string was several thousand lines away from
the conflict!

--

=============================================
Cameron Horsburgh

=============================================