Received: from spf3.us4.outblaze.com (spf3.us4.outblaze.com [205.158.62.25])
	by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id iALN5H4h002112
	for <migo@freeshell.org>; Sun, 21 Nov 2004 23:05:17 GMT
Received: from lists.gnu.org (lists.gnu.org [199.232.76.165])
	by spf3.us4.outblaze.com (Postfix) with ESMTP id 1B1D1540C9
	for <migo@homemail.com>; Sun, 21 Nov 2004 23:05:19 +0000 (GMT)
Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33)
	id 1CW0uk-0007df-CE
	for migo@homemail.com; Sun, 21 Nov 2004 18:14:38 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CW0uE-0007d3-Ot
	for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:14:06 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CW0uD-0007cR-RR
	for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:14:06 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CW0uD-0007cH-OW
	for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:14:05 -0500
Received: from [129.88.30.1] (helo=imag.imag.fr)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CW0kz-0007nc-LI
	for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:04:33 -0500
Received: from ecrins.imag.fr (ecrins.imag.fr [129.88.43.124])
	by imag.imag.fr (8.13.0/8.13.0) with ESMTP id iALN4SW9028807;
	Mon, 22 Nov 2004 00:04:28 +0100 (CET)
Received: from moy by ecrins.imag.fr with local (Exim 3.35 #1)
	id 1CW0ku-0004H7-00; Mon, 22 Nov 2004 00:04:28 +0100
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>
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:04:28 +0100
In-Reply-To: <20041121225231.GA4518@rogers.com> (Dimitrie O. Paun's message
	of "Sun, 21 Nov 2004 17:52:31 -0500")
Message-ID: <vpqzn1apzwj.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
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-1.4
	(imag.imag.fr [129.88.30.1]); Mon, 22 Nov 2004 00:04:28 +0100 (CET)
X-IMAG-MailScanner: Found to be clean
X-IMAG-MailScanner-Information: Please contact the ISP for more information
Cc: arch <gnu-arch-users@gnu.org>, Zenaan Harkness <zen@cashpoolcomps.com>
Subject: [Gnu-arch-users] Re: diff markers/ star merge
X-BeenThere: gnu-arch-users@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: a discussion list for all things arch-ish <gnu-arch-users.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnu-arch-users>,
	<mailto:gnu-arch-users-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnu-arch-users>
List-Post: <mailto:gnu-arch-users@gnu.org>
List-Help: <mailto:gnu-arch-users-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnu-arch-users>,
	<mailto:gnu-arch-users-request@gnu.org?subject=subscribe>
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: 391
Lines: 17
"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

-- 
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/