On Thu, 2010-04-01 at 10:41 +0100, Gustavo Narea wrote: > Hello, Martin et al. > > It's funny, before starting to write this email, another merge went > wrong. This time with a different branch. Send us a log with merge --debug. -- http://selenic.com : development and support for Mercurial and Linux