On Sun, 18 Nov 2007 13:01:56 +0100
Peter Schuller <[EMAIL PROTECTED]> wrote:
> > Isn't that what the -U option in mergemaster does?
> >
> >
> >-U Attempt to auto upgrade files that have not been user
> >modified.
>
> I believe I t
> Isn't that what the -U option in mergemaster does?
>
>
>-U Attempt to auto upgrade files that have not been user
>modified.
I believe I tried this once and it did not make a difference, but I didn't
investigate. Perhaps I screwe
On Sat, 17 Nov 2007 11:15:58 +0100
Peter Schuller <[EMAIL PROTECTED]> wrote:
> Hello,
>
> etcmerge, with three-way merging, has been available for a while, but
> the man page still warns of it not being extensively tested, and of
> course mergermaster still seems to be the officially supported to
Hello,
etcmerge, with three-way merging, has been available for a while, but the man
page still warns of it not being extensively tested, and of course
mergermaster still seems to be the officially supported tool.
In spite of this, etcmerge is attractive since, to be honest, manually
saying "y
