Chris Shoemaker <c.shoemaker@xxxxxxx> 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. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
