Subject: Re: [Gnu-arch-users] diff markers/ star merge
From: Zenaan Harkness <zen@cashpoolcomps.com>
To: arch <gnu-arch-users@gnu.org>
In-Reply-To: <20041121222245.GC23410@rogers.com>
References: <1101070919.6134.11.camel@localhost.localdomain>
	<41A112A4.4070207@panoramicfeedback.com>
	<20041121222245.GC23410@rogers.com>
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Message-Id: <1101076174.6134.84.camel@localhost.localdomain>
Mime-Version: 1.0
Date: Mon, 22 Nov 2004 09:29:34 +1100
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: 1040
Lines: 31
On Mon, 2004-11-22 at 09:22, Dimitrie O. Paun wrote:
> On Sun, Nov 21, 2004 at 05:11:48PM -0500, Aaron Bentley wrote:
> > Zenaan Harkness wrote:
> > 
> > >So, I can tla undo, tla star-merge then tla redo, except when I tla redo
> > >I get the .rej conflict files rather than diff3 in-file markers.
> > 
> > I realize that .rej files may be unfamiliar, but now that I'm used to 
> > them, I find them quite readable.  The top half shows the text the patch 
> > was expecting, the bottom shows what the patch tried to turn it into.
> 
> Maybe, but I still like the inline markers a *lot* more. 
> How can one get them?

tla star-merge --three-way

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).

cheers
zen


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