From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Jul 2010 16:26:46 GMT
Subject: Re: [PATCHv2 1/2] add basic tests for merge-tree
Message-ID: <7vwrsyxc55.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1279090893.2789.21.camel@dreddbeard>

Will Palmer <wmpalmer@gmail.com> 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.