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

[Brian May]

>>>>> "Jan" == Jan Hudec <address@hidden> writes:

    Jan> There is: wiggle

I have had wiggle die horribly; I sent in a bug report, but
unfortunately I was working on a large closed-source file at the time,
and they couldn't reproduce the problem without source code... :-(.
So ... if you can reproduce a crash with open source, please file a
bug report.

People have said *.rej files are better then adding markers into the
file. I have insufficient experience with *.rej files myself, so can't
comment. I do know that some changes can result in very large and
complicated conflict marker areas (at least with subversion). eg. wrap
all lines that are too long in a HTML file, and merge in a single
character change (on a single line)...

My only real compliant with *.rej files is that they are not
in unified diff format. Somebody said you could use filterdiff, from
patchutils to translate the patch.

How do you do this? So for, whenever I have tried on a *.rej file, I
don't get any output...

Another option is to use emacs diff mode, which does work.
-- 
Brian May <address@hidden>