You can always strip a bad committed merge, abort a bad uncommitted one, and perform it again (maybe with different tooling). Normally mercurial stops when the

You can always strip a bad committed merge, abort a bad uncommitted one, and perform it again (maybe with different tooling). Normally mercurial stops when there are conflicts it cannot resolve reliably. In that cases, have a try at kdiff3: it handles hairy merges quite well. In a lot of cases even automatically (and correctly). There is always meld, but I'd say kdiff3 is superior wrt merge conflict resolution.