Re: SCMS question - Mailing list pgsql-hackers

From Markus Schiltknecht
Subject Re: SCMS question
Date
Msg-id 45E2B145.1060506@bluegap.ch
Whole thread Raw
In response to Re: SCMS question  (Tom Lane <tgl@sss.pgh.pa.us>)
Responses Re: SCMS question  (mark@mark.mielke.cc)
List pgsql-hackers
Hi,

Tom Lane wrote:
> Yah know, the one bit of these pitches that always sounds like pure
> snake oil is the claim that they offer some kind of mechanical solution
> to merge conflicts.  AFAICS that has nothing to do with the SCMS in use
> and everything to do with whether your "diff" command is AI-complete.

You should have said "merge" command. Every tried that? Or kdiff3? Try 
it, you will be surprised!

Regards

Markus



pgsql-hackers by date:

Previous
From: Markus Schiltknecht
Date:
Subject: Re: SCMS question
Next
From: Markus Schiltknecht
Date:
Subject: Re: [Monotone-devel] Re: SCMS question