$ hg ci -m "Merge latest mainline changes" abort: unresolved merge conflicts (see hg resolve) Here, I am tempted to launch "hg resolve" as suggested by the message. But this will actively destroy any conflict resolution I have done manually, instead of simply listing which files I must mark resolved. This makes the above message dangerous for the user. I would actually advocate removing parameter-less "hg resolve", since I find its behaviour questionable (why drop all user changes? that must be the only hg command that destroys stuff without any specific parameter); but I guess some people would be opposed. But at least the message should be changed; I have been bitten more than once and it's very painful to lose changes.
Ok, I was pointed out that "hg resolve" doesn't re-merge anymore. This simply means the message should be updated to something like "hg help resolve".
Fixed in crew-stable: http://hg.intevation.org/mercurial/crew/rev/919174c0aaff Thanks for reporting it
--- Bug imported by bugzilla@serpentine.com 2012-05-12 09:17 EDT --- This bug was previously known as _bug_ 2681 at http://mercurial.selenic.com/bts/issue2681