Subject: Re: merge-recursive: do not rudely die on binary merge

From: Junio C Hamano <[email-masked]>
Date: Tue, 14 Aug 2007 17:07:18 -0700

Chris Shoemaker <[email-masked]> writes:

> Very nice. Thanks, Junio.  As an additional convenience, it would be
> nice to make the "theirs" version easily accessible.

People should learn this command.  Really.

	$ git cat-file -p :$n:path

where $n == 2 is ours, $n == 1 is common ancestor, and $n == 3
is theirs.