-BEGIN PGP SIGNED MESSAGE-
Hash: RIPEMD160
Mel Flynn wrote:
> On Sunday 26 April 2009 11:12:12 Frederique Rijsdijk wrote:
>> Bruce Cran wrote:
>>> On Sat, 25 Apr 2009 12:10:42 +0200
>>>
>>> Peter Schuller wrote:
I recently began testing mergemaster -U since the perpetual "review
On Sunday 26 April 2009 11:12:12 Frederique Rijsdijk wrote:
> Bruce Cran wrote:
> > On Sat, 25 Apr 2009 12:10:42 +0200
> >
> > Peter Schuller wrote:
> >> I recently began testing mergemaster -U since the perpetual "review
> >> diff of file I never touched" grows annoying real quick.
> >>
> >> Unfo
Peter Schuller wrote:
> I recently began testing mergemaster -U since the perpetual "review
> diff of file I never touched" grows annoying real quick.
>
> Unfortunately I recently discovered that it does not seem to do what
> you might expect. For example it nuked my mailer.conf on one machine,
>
On Apr 25, 2009, at 5:10 AM, Peter Schuller wrote:
Unfortunately I recently discovered that it does not seem to do what
you might expect. For example it nuked my mailer.conf on one machine,
and my /etc/namedb/named.conf (!!!) on another machine.
Me, too. I lost exactly those two files during
Bruce Cran wrote:
On Sat, 25 Apr 2009 12:10:42 +0200
Peter Schuller wrote:
I recently began testing mergemaster -U since the perpetual "review
diff of file I never touched" grows annoying real quick.
Unfortunately I recently discovered that it does not seem to do what
you might expect. For
On Sat, 25 Apr 2009 12:10:42 +0200
Peter Schuller wrote:
> I recently began testing mergemaster -U since the perpetual "review
> diff of file I never touched" grows annoying real quick.
>
> Unfortunately I recently discovered that it does not seem to do what
> you might expect. For example it nu
I recently began testing mergemaster -U since the perpetual "review
diff of file I never touched" grows annoying real quick.
Unfortunately I recently discovered that it does not seem to do what
you might expect. For example it nuked my mailer.conf on one machine,
and my /etc/namedb/named.conf (!!!