Skip to navigation

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

ACID (Atomicity, Consistency, Isolation, and Durability)