Lost changes during merges

[Hans Meine]

On Wednesday 20 January 2010 10:36:41 Pavel Shevaev wrote:
> > sure, this is actually really easy. Clone the repo, and strip the
> > merge revision:
> >  hg strip 7722
> 
> Thanks for the tip but where is the 'strip' command? Is it in some
> 'strip' extension and if yes where can I find the one? (at least it's
> not listed here http://mercurial.selenic.com/wiki/UsingExtensions)

It's in the mq extension, but AFAICS you don't even need to do the (dangerous) 
strip.  Just update to one of the revision and give the second revision to hg 
merge using the -r parameter.

HTH,
  Hans