Skip to navigation

Question:
Abort: unresolved merge conflicts (see 'hg help resolve')

When in doubt, use brute force.