Date: Sun, 21 Nov 2004 17:22:45 -0500
From: "Dimitrie O. Paun" <dpaun@rogers.com>
To: Aaron Bentley <abentley@panoramicfeedback.com>
Subject: Re: [Gnu-arch-users] diff markers/ star merge
Message-ID: <20041121222245.GC23410@rogers.com>
References: <1101070919.6134.11.camel@localhost.localdomain>
	<41A112A4.4070207@panoramicfeedback.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <41A112A4.4070207@panoramicfeedback.com>
User-Agent: Mutt/1.4.1i
Cc: arch <gnu-arch-users@gnu.org>, Zenaan Harkness <zen@cashpoolcomps.com>
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: 769
Lines: 24
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?

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