equal
deleted
inserted
replaced
153 adding a |
153 adding a |
154 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
154 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
155 created new head |
155 created new head |
156 merging a |
156 merging a |
157 warning: conflicts during merge. |
157 warning: conflicts during merge. |
158 merging a failed! |
158 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
159 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
159 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
160 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
160 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
161 abort: cannot manage merge changesets |
161 abort: cannot manage merge changesets |
162 $ rm -r sandbox |
162 $ rm -r sandbox |
163 |
163 |
226 adding a |
226 adding a |
227 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
227 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
228 created new head |
228 created new head |
229 merging a |
229 merging a |
230 warning: conflicts during merge. |
230 warning: conflicts during merge. |
231 merging a failed! |
231 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
232 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
232 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
233 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
233 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
234 abort: cannot manage merge changesets |
234 abort: cannot manage merge changesets |
235 $ rm -r sandbox |
235 $ rm -r sandbox |