[Gnu-arch-users] Re: diff markers/ star merge

[Matthieu Moy]

Matthieu Moy <address@hidden> writes:

> "Dimitrie O. Paun" <address@hidden> writes:
>
>> I use vim too. What would emacs offer here BTW?
>
> http://wiki.gnuarch.org/moin.cgi/Process_20_2a_2erej_20files

And

http://wagner.elixus.org/~clkao/svk-intro/images/svk-merge-emacs.png

for diff3 conflicts (taken from an svk presentation, but it's the same
for arch since it's a generic mode for diff3 markers).

-- 
Matthieu