equal
deleted
inserted
replaced
51 created new head |
51 created new head |
52 merging a |
52 merging a |
53 warning: conflicts during merge. |
53 warning: conflicts during merge. |
54 merging a failed! |
54 merging a failed! |
55 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
55 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
56 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
56 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
57 abort: cannot manage merge changesets |
57 abort: cannot manage merge changesets |
58 %%% hg headers |
58 %%% hg headers |
59 adding a |
59 adding a |
60 % qnew should refuse bad patch names |
60 % qnew should refuse bad patch names |
61 abort: "series" cannot be used as the name of a patch |
61 abort: "series" cannot be used as the name of a patch |
114 created new head |
114 created new head |
115 merging a |
115 merging a |
116 warning: conflicts during merge. |
116 warning: conflicts during merge. |
117 merging a failed! |
117 merging a failed! |
118 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
118 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
119 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
119 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
120 abort: cannot manage merge changesets |
120 abort: cannot manage merge changesets |