equal
deleted
inserted
replaced
25 warning: conflicts during merge. |
25 warning: conflicts during merge. |
26 merging f failed! |
26 merging f failed! |
27 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue |
27 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue |
28 |
28 |
29 % Fix the 2nd conflict |
29 % Fix the 2nd conflict |
30 saving bundle to |
|
31 adding branch |
30 adding branch |
32 adding changesets |
31 adding changesets |
33 adding manifests |
32 adding manifests |
34 adding file changes |
33 adding file changes |
35 added 2 changesets with 2 changes to 1 files |
34 added 2 changesets with 2 changes to 1 files |
105 @@ -1,1 +1,1 @@ |
104 @@ -1,1 +1,1 @@ |
106 -mq1 |
105 -mq1 |
107 +mq2 |
106 +mq2 |
108 |
107 |
109 % Rebase the applied mq patches |
108 % Rebase the applied mq patches |
110 saving bundle to |
|
111 % And the patches are correct |
109 % And the patches are correct |
112 % Git patch |
110 % Git patch |
113 # HG changeset patch |
111 # HG changeset patch |
114 # User test |
112 # User test |
115 # Date |
113 # Date |