Skip to navigation

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

All problems in computer science can be solved with another level of abstraction. Except for the resulting complexity