Mercurial undo command

[Bryan O'Sullivan]

On Wed, 2006-05-10 at 11:42 +0200, Thomas Arendsen Hein wrote:

> 'hg merge' now tells you how to redo the merge, e.g.:
> 
> 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
> There are unresolved merges, you can redo the full merge using:
>   hg update -C 1
>   hg merge 2

Nice.

> Is this a solution for you?

I think that Sebastien's svn-merge script is pretty nice, too.  If
Sebastien agrees, we should pop it in contrib.

	<b

-- 
Bryan O'Sullivan <bos at serpentine.com>