From: Daniel Barkalow <hidden> Date: 2016-06-15 22:42:14
On Mon, 28 Nov 2005, Junio C Hamano wrote:
*1* It is a shame that the most comprehensive definition of
3-way read-tree semantics is in t/t1000-read-tree-m-3way.sh test
script.
Isn't Documentation/technical/trivial-merge.txt more comprehensive?
Probably the tables in various other places should be replaced with
references to this document.
-Daniel