Re: new feature suggestion: 3-way conflict indicators

[Eric Siegerman]

On Tue, Jun 18, 2002 at 11:33:18PM -0400, Greg A. Woods wrote:
> [ On Wednesday, June 19, 2002 at 09:04:37 (+1000), Matthew Herrmann wrote: ]
> > Subject: new feature suggestion: 3-way conflict indicators
> 
> The core patch is (including some extra unrelated fixes):

Without the unrelated fixes, it's a one-character change (this is
from 1.11.1p1, but I doubt it's changed significantly for
1.11.2).  Be warned though; this patch will make sanity.sh fail
big-time.


--- rcscmds.c   Thu Apr 19 15:45:33 2001
+++ -   Wed Jun 19 13:46:12 2002
@@ -298,7 +298,7 @@
        only for diagnostic messages -- CVS no longer forks to run diff3. */
     diffout = cvs_temp_name();
     call_diff_setup ("diff3");
-    call_diff_arg ("-E");
+    call_diff_arg ("-A");
     call_diff_arg ("-am");
 
     call_diff_arg ("-L");


--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
Anyone who swims with the current will reach the big music steamship;
whoever swims against the current will perhaps reach the source.
        - Paul Schneider-Esleben