Re: [PATCHv2 1/2] add basic tests for merge-tree

Will Palmer [off-list ref] writes:

However, merge-tree has a function similar to diff (it shows differences
between trees) and apply (it creates the "result" object when there are
no conflicts), and its purpose seems to be more of a "shower" than a
"do-er" (contrasted with something like git-merge, which actually
creates a commit object, for example), so I thought that diff-commands
would be a good classification.

Ok, that makes sense (I haven't heard anybody use merge-tree in real life,
though).  Let's keep the numbering as-is.