From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Jan 2009 19:55:30 GMT
Subject: Re: Common ancestor in merge diffs?
Message-ID: <7vhc3l6dvx.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <alpine.LNX.1.00.0901261318030.19665@iabervon.org>

Daniel Barkalow <barkalow@iabervon.org> writes:

> I was just doing an annoying merge (I'd reorganized code while other 
> people made changes to it), and I kept having the problem that it was hard 
> to figure out what each side had done. Is there some way to ask git for 
> the diffs between the common ancestor (which is unique in my case, so it's 
> actually useful) and each of the sides of the merge?

Have you tried "git checkout --conflict=diff3 $that_conflicted_path"?