Re: using meld to resolve cvs conflicts

[Stephen Kennedy <stevek gnome org>]

> <<<<<<< driver.c
>     exit(nerr == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
> =======
>     exit(!!nerr);
> >>>>>>> 1.6
> 
> Can meld be used on a such a formatted file?  I don't really want to
> make a script to make two different version from the dual-version copy
> and then diff those unless I have to.

How would you like that to be displayed? In three panes with the
non-conflicting changes merged into the middle? Thats pretty easy
from a file containing conflicts.

Ideally I suppose the middle file would have the original (base)
text also. This is a little harder to recover.

Stephen.