Johannes Sixt wrote: > then diff3 must display the conflict as > > 12<ABC|34=AXC>56 > > to be technically correct. RCS style can coalesce A and C outside of the > conflict and display it as > > 12A<B=X>C34 > > and *that* is the helpful part of this simpler style. I have trouble translating the above to what I'm familiar with in my mind, so... diff2: 1 2 A <<<<<<< l B ======= X >>>>>>> r C 5 6 diff3: 1 2 <<<<<<< l A B C ||||||| b 3 4 ======= A X C >>>>>>> r 5 6 I personally don't mind at all having a few extra lines in order to visualize what actually happened. But of course there's zdiff3: 1 2 A <<<<<<< l B ||||||| b 3 4 ======= X >>>>>>> r C 5 6 Which is the best of both worlds, even if not technically accurate. Cheers. -- Felipe Contreras
