[PATCH] cumulative merge patch

[Martin Pool]

On  2 Jun 2005, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> This patch contains all the changes to merge that I'd like to get into
> 0.5, namely
> * common ancestor BASE selection
> * merge reports conflicts when they are encountered
> * merge refuses to operate in working trees with changes
> * introduces revert command to revert the working tree to the
> last-committed state
> * Adds some reasonable help text

Thanks, taken.

-- 
Martin