Re: merge conflict diff

From: Jeff King <peff@peff.net>
Date: Apr 3, 2008, 14:26 UTC
Message-ID: <20080403142649.GA16699@coredump.intra.peff.net>
In-Reply-To: <b9fd99020804030713n3c1a2602t847e8a132f8ccd06@mail.gmail.com>

On Thu, Apr 03, 2008 at 08:13:04AM -0600, Jeremy Ramer wrote:

Show 7 quoted lines

> 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

You may also want to look at the git-mergetool script, which uses both versions (along with the ancestor) as the arguments to many common merge resolution programs.

-Peff