(off-list ancestor, not in this archive)
Re: merge-recursive: do not rudely die on binary merge · Junio C Hamano <hidden> · 2016-06-15
Re: merge-recursive: do not rudely die on binary merge · Nikodemus Siivola <hidden> · 2016-06-15
[PATCH] Document what the stage numbers in the :$n:path syntax mean. · Steven Grimm <hidden> · 2016-06-15
Re: [PATCH] Document what the stage numbers in the :$n:path syntax mean. · Jeff King <hidden> · 2016-06-15
Re: [PATCH] Document what the stage numbers in the :$n:path syntax mean. · Shawn O. Pearce <hidden> · 2016-06-15
Re: [PATCH] Document what the stage numbers in the :$n:path syntax mean. · Shawn O. Pearce <hidden> · 2016-06-15
Re: [PATCH] Document what the stage numbers in the :$n:path syntax mean. · Jeff King <hidden> · 2016-06-15
Re: [PATCH] Document what the stage numbers in the :$n:path syntaxmean. · Johannes Sixt <hidden> · 2016-06-15

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:29

Possibly related (same subject, not in this thread)

2016-06-15 · merge-recursive: do not rudely die on binary merge · Junio C Hamano <hidden>
2016-06-15 · Re: merge-recursive: do not rudely die on binary merge · Chris Shoemaker <hidden>
2016-06-15 · Re: merge-recursive: do not rudely die on binary merge · Junio C Hamano <hidden>
2016-06-15 · Re: merge-recursive: do not rudely die on binary merge · Chris Larson <hidden>
2016-06-15 · Re: merge-recursive: do not rudely die on binary merge · Chris Shoemaker <hidden>

Chris Shoemaker [off-list ref] 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.