Philip Monk c7480c9b07 clay: fix bug in %mate ... If both sides changed a file in the same way, %mate used the version in the mergebase, which is incorrect. This changes it to use the version in the destination desk. An example of this issue: > +cat %/test/hoon /~zod/home/~2020.9.3..21.41.24..61ed/test/hoon first > |merge %scratch our %home >= merged with strategy %fine + /~zod/scratch/2/test/hoon > +cat /=scratch=/test /~zod/scratch/~2020.9.3..21.41.32..408c/test/hoon first > *%/test/hoon 'second' : /~zod/home/3/test/hoon > *%%%/scratch=/test/hoon 'second' : /~zod/scratch/3/test/hoon > |merge %scratch our %home >= %fine merge failed, trying %meet %meet merge failed, trying %mate merged with strategy %mate : /~zod/scratch/4/test/hoon > +cat /=scratch=/test /~zod/scratch/~2020.9.3..21.42.25..9e8b/test/hoon first		2020-09-03 14:34:30 -07:00
..
help.txt