From: Linus Torvalds <torvalds@osdl.org>
Date: Tue, 26 Apr 2005 17:11:19 GMT
Subject: Re: [RFC] diff-cache buglet
Message-ID: <Pine.LNX.4.58.0504261005360.18901@ppc970.osdl.org>
In-Reply-To: <7v7jippjky.fsf@assigned-by-dhcp.cox.net>



On Tue, 26 Apr 2005, Junio C Hamano wrote:
> 
> The patch lets you have it in both ways by adding --unmerged
> flag.  Without it, unmerged entries are culled at the beginning;
> with it, you will see diffs for all unmerged stages.

I'm ok with that, but if so I think it should show the stage somehow, and
make it clear that it's unmerged. Maybe by appending something to the name
(maybe just a ':' and stage number, but I'd almost prefer the stage number
to be translated into something human-readable, so maybe we could have
something like

	filename.c^orig
	filename.c^first
	filename.c^second

for stages 1-3 respectively)?

I'll apply your fix right now.

		Linus