Re: Common ancestor in merge diffs?
Daniel Barkalow <barkalow@iabervon.org> writes:
Show 5 quoted lines
> 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"?
Junio C Hamano <gitster@pobox.com>