Felipe Contreras <felipe.contreras@xxxxxxxxx> writes: > Sergey Organov wrote: >> Felipe Contreras <felipe.contreras@xxxxxxxxx> writes: >> >> > 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. >> >> Plus a good tool should have an option to quickly show a diff between any >> 2 of 3 parts, making analysis even simpler. > > Indeed, it depends on the mergetool, but personally I use vimdiff3 > (which I authored). All I need are diff3 conflict markers plus some > colors. Emacs's smerge-mode works fine too. In fact that was what made me switch to diff3 in git config. Thanks, -- Sergey Organov
