Received: from spf5.us4.outblaze.com (spf5.us4.outblaze.com [205.158.62.27]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id iALMrm4h007018 for ; Sun, 21 Nov 2004 22:53:49 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf5.us4.outblaze.com (Postfix) with ESMTP id A939576E46 for ; Sun, 21 Nov 2004 22:53:50 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CW0je-0004Un-5Q for migo@homemail.com; Sun, 21 Nov 2004 18:03:10 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CW0ii-0004UO-1i for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:02:13 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CW0ig-0004U7-RF for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:02:11 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CW0ig-0004U2-9k for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:02:10 -0500 Received: from [206.190.36.79] (helo=smtp101.rog.mail.re2.yahoo.com) by monty-python.gnu.org with smtp (Exim 4.34) id 1CW0ZN-0005iK-Bt for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 17:52:33 -0500 Received: from unknown (HELO localhost.localdomain) (dpaun@rogers.com@69.194.157.31 with login) by smtp101.rog.mail.re2.yahoo.com with SMTP; 21 Nov 2004 22:52:32 -0000 Received: from localhost.localdomain (dimi [127.0.0.1]) by localhost.localdomain (8.13.1/8.13.1) with ESMTP id iALMqVPZ004534; Sun, 21 Nov 2004 17:52:31 -0500 Received: (from dimi@localhost) by localhost.localdomain (8.13.1/8.13.1/Submit) id iALMqV2M004533; Sun, 21 Nov 2004 17:52:31 -0500 X-Authentication-Warning: localhost.localdomain: dimi set sender to dpaun@rogers.com using -f Date: Sun, 21 Nov 2004 17:52:31 -0500 From: "Dimitrie O. Paun" To: Zenaan Harkness Subject: Re: [Gnu-arch-users] diff markers/ star merge Message-ID: <20041121225231.GA4518@rogers.com> References: <1101070919.6134.11.camel@localhost.localdomain> <41A112A4.4070207@panoramicfeedback.com> <20041121222245.GC23410@rogers.com> <1101076174.6134.84.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1101076174.6134.84.camel@localhost.localdomain> User-Agent: Mutt/1.4.1i Cc: arch 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: 559 Lines: 22 On Mon, Nov 22, 2004 at 09:29:34AM +1100, Zenaan Harkness wrote: > tla star-merge --three-way Cool, thanks. > And I fully agree - in-line markers are much more efficient on my time. > But I use vim, so I guess Emacsen users have better facilities (good for > them, sad for us). I use vim too. What would emacs offer here BTW? -- Dimi. _______________________________________________ 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/