Re: merge conflict diff

On Thu, Apr 3, 2008 at 8:26 AM, Jeff King [off-list ref] wrote:

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
 > [...]

quoted

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

Perfect! I was not aware of that syntax. That solves the question I asked.

 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.

This suggestion solves the actual problem in a much better way than I
was thinking.  Thanks for the help!