equal
deleted
inserted
replaced
101 changeset: 1:802f095af299 |
101 changeset: 1:802f095af299 |
102 user: test |
102 user: test |
103 date: Mon Jan 12 13:46:40 1970 +0000 |
103 date: Mon Jan 12 13:46:40 1970 +0000 |
104 summary: 2 |
104 summary: 2 |
105 |
105 |
106 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |
106 abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes) |
107 failed |
107 failed |
108 abort: outstanding uncommitted changes |
108 abort: outstanding uncommitted changes |
109 failed |
109 failed |
110 resolving manifests |
110 resolving manifests |
111 overwrite False partial False |
111 overwrite False partial False |