To: "Dimitrie O. Paun" <dpaun@rogers.com>
References: <1101070919.6134.11.camel@localhost.localdomain>
	<41A112A4.4070207@panoramicfeedback.com>
	<20041121222245.GC23410@rogers.com>
	<1101076174.6134.84.camel@localhost.localdomain>
	<20041121225231.GA4518@rogers.com> <vpqzn1apzwj.fsf@ecrins.imag.fr>
From: Matthieu Moy <Matthieu.Moy@imag.fr>
Mail-Followup-To: "Dimitrie O. Paun" <dpaun@rogers.com>,
	Zenaan Harkness <zen@cashpoolcomps.com>,
	arch <gnu-arch-users@gnu.org>
Date: Mon, 22 Nov 2004 00:19:41 +0100
In-Reply-To: <vpqzn1apzwj.fsf@ecrins.imag.fr> (Matthieu Moy's message of
	"Mon, 22 Nov 2004 00:04:28 +0100")
Message-ID: <vpqvfbypz76.fsf@ecrins.imag.fr>
User-Agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: arch <gnu-arch-users@gnu.org>, Zenaan Harkness <zen@cashpoolcomps.com>
Subject: [Gnu-arch-users] Re: diff markers/ star merge
Precedence: list
Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Status: RO
Content-Length: 645
Lines: 26
Matthieu Moy <Matthieu.Moy@imag.fr> writes:

> "Dimitrie O. Paun" <dpaun@rogers.com> 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


_______________________________________________
Gnu-arch-users mailing list
Gnu-arch-users@gnu.org
http://lists.gnu.org/mailman/listinfo/gnu-arch-users

GNU arch home page:
http://savannah.gnu.org/projects/gnu-arch/