From: Junio C Hamano Date: Mon, 04 Sep 2006 22:23:16 GMT Subject: Re: [PATCH] Do 3-way diff between HEAD, index and working directory Message-ID: <7vpsebl19n.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <17660.4160.642852.177249@cargo.ozlabs.ibm.com> Paul Mackerras writes: > This implements a 3-way diff between the HEAD commit, the state in the > index, and the working directory. This is like the n-way diff for a > merge, and uses much of the same code. It is invoked with the -c flag > to git-diff-index, which it already accepted and did nothing with. > > Signed-off-by: Paul Mackerras > --- > Junio, does this look right? Seems correct from a cursory look. This also seems to change the behaviour for an unmerged entry case slightly but I think it is for the better (depending on the definition of "better" -- some people may feel combined diff to be weird and confusing).