equal
deleted
inserted
replaced
110 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) |
110 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) |
111 failed |
111 failed |
112 abort: outstanding uncommitted changes |
112 abort: outstanding uncommitted changes |
113 failed |
113 failed |
114 resolving manifests |
114 resolving manifests |
115 force None allow 1 moddirstate True linear False |
115 force False allow True moddirstate True linear False |
116 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 |
116 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 |
117 a versions differ, resolve |
117 a versions differ, resolve |
118 b versions differ, resolve |
118 b versions differ, resolve |
119 merging a |
119 merging a |
120 resolving a |
120 resolving a |