14400578   
   From: 0xCDCDCDCD@gmx.at   
      
   On 04.02.2012 00:40, Mathias Gaunard wrote:   
   > On Feb 2, 5:44 am, "Martin B."<0xCDCDC...@gmx.at>  wrote:   
   >>> There is no merging involved. Reviewing a diff is not at all like   
   >>> resolving merge conflicts.   
   >>   
   >> "Araxis Merge" is the name of a diff/3-way merge tool for Windows.   
   >   
   > I was aware of that, which is why I told you merging had nothing to do   
   > with it.   
   > 3-way diff, as the name suggests, is only useful when you have three   
   > versions to compare (which is what happens when you merge several   
   > heads), not when you have two.   
   >   
      
   Just to clarify: I was referring to my use of A.M. as 2-way-diff --   
   "simple" side-by-side text comparison. I does that very nicely too. And   
   I *think* I prefer it over command-line-diff, although I'll admit I   
   never had to work with any command-line diff extensively.   
      
   cheers,   
   Martin   
      
   --   
   Good C++ code is better than good C code, but   
   bad C++ can be much, much worse than bad C code.   
      
      
         [ See http://www.gotw.ca/resources/clcm.htm for info about ]   
         [ comp.lang.c++.moderated.    First time posters: Do this! ]   
      
   --- SoupGate-Win32 v1.05   
    * Origin: you cannot sedate... all the things you hate (1:229/2)