From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Thu, 03 Apr 2008 16:48:22 GMT
Subject: Re: merge conflict diff
Message-ID: <vpqk5jeubop.fsf@bauges.imag.fr>
In-Reply-To: <20080403142649.GA16699@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

> On Thu, Apr 03, 2008 at 08:13:04AM -0600, Jeremy Ramer wrote:
>
>> I am trying to figure out how to quickly diff two source files that
>> led to a merge conflict.  When a conflict occurs the command
>> [...]
>> So far I am thinking of
>> # git checkout-index --stage=2 --temp foo
>> # git checkout-index --stage=3 --temp foo
>> # git diff .merge_x1 .merge_x2
>
> The special ref syntax :<n>:file refers to the blob in stage <n> of the
> index. So you can see them with:
>
>   git show :2:foo
>   git show :3:foo
>
> Or diff them with:
>
>   git diff :2:foo :3:foo

See also

git diff --ours
git diff --theirs
git diff --base

and man git-diff-files (BTW, it's a pity not to find this in man
git-diff).

-- 
Matthieu