equal
deleted
inserted
replaced
99 b versions differ, resolve |
99 b versions differ, resolve |
100 this update spans a branch affecting the following files: |
100 this update spans a branch affecting the following files: |
101 a (resolve) |
101 a (resolve) |
102 b (resolve) |
102 b (resolve) |
103 aborting update spanning branches! |
103 aborting update spanning branches! |
104 (use 'hg merge' to merge across branches or '-C' to lose changes) |
104 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) |
105 failed |
105 failed |
106 abort: outstanding uncommitted changes |
106 abort: outstanding uncommitted changes |
107 failed |
107 failed |
108 resolving manifests |
108 resolving manifests |
109 force None allow 1 moddirstate True linear False |
109 force None allow 1 moddirstate True linear False |