From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Aug 2007 00:07:18 GMT
Subject: Re: merge-recursive: do not rudely die on binary merge
Message-ID: <7vps1paceh.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070814231422.GA10662@pe.Belkin>

Chris Shoemaker <c.shoemaker@cox.net> 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.