Skip to navigation

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

Design for the future, because it will be here sooner than you think.