equal
deleted
inserted
replaced
91 changeset: 1:802f095af299 |
91 changeset: 1:802f095af299 |
92 user: test |
92 user: test |
93 date: Mon Jan 12 13:46:40 1970 +0000 |
93 date: Mon Jan 12 13:46:40 1970 +0000 |
94 summary: 2 |
94 summary: 2 |
95 |
95 |
96 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |
96 abort: outstanding uncommited changes, use 'hg update -C' to lose changes |
97 failed |
97 failed |
98 abort: outstanding uncommitted changes |
98 abort: outstanding uncommitted changes |
99 failed |
99 failed |
100 resolving manifests |
100 resolving manifests |
101 overwrite False partial False |
101 overwrite False partial False |