Skip to navigation

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

Programmer time is expensive, conserve it in preference to machine time.