Skip to navigation

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

Code that is graceful and clear is less likely to break.