equal
deleted
inserted
replaced
44 $ hg id |
44 $ hg id |
45 618808747361+c0c68e4fe667+ tip |
45 618808747361+c0c68e4fe667+ tip |
46 |
46 |
47 $ cat a |
47 $ cat a |
48 Small Mathematical Series. |
48 Small Mathematical Series. |
|
49 1 |
|
50 2 |
|
51 3 |
49 <<<<<<< local: 618808747361 - test: branch2 |
52 <<<<<<< local: 618808747361 - test: branch2 |
50 1 |
53 6 |
51 2 |
54 8 |
52 3 |
55 ======= |
53 6 |
|
54 8 |
|
55 ======= |
|
56 1 |
|
57 2 |
|
58 3 |
|
59 4 |
56 4 |
60 5 |
57 5 |
61 >>>>>>> other: c0c68e4fe667 - test: branch1 |
58 >>>>>>> other: c0c68e4fe667 - test: branch1 |
62 Hop we are done. |
59 Hop we are done. |
63 |
60 |
77 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
74 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
78 [1] |
75 [1] |
79 |
76 |
80 $ cat a |
77 $ cat a |
81 Small Mathematical Series. |
78 Small Mathematical Series. |
|
79 1 |
|
80 2 |
|
81 3 |
82 <<<<<<< local: test 2 |
82 <<<<<<< local: test 2 |
83 1 |
83 6 |
84 2 |
84 8 |
85 3 |
85 ======= |
86 6 |
|
87 8 |
|
88 ======= |
|
89 1 |
|
90 2 |
|
91 3 |
|
92 4 |
86 4 |
93 5 |
87 5 |
94 >>>>>>> other: test 1 |
88 >>>>>>> other: test 1 |
95 Hop we are done. |
89 Hop we are done. |
96 |
90 |
106 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
100 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
107 [1] |
101 [1] |
108 |
102 |
109 $ cat a |
103 $ cat a |
110 Small Mathematical Series. |
104 Small Mathematical Series. |
|
105 1 |
|
106 2 |
|
107 3 |
111 <<<<<<< local: test 2 |
108 <<<<<<< local: test 2 |
112 1 |
109 6 |
113 2 |
110 8 |
114 3 |
111 ======= |
115 6 |
|
116 8 |
|
117 ======= |
|
118 1 |
|
119 2 |
|
120 3 |
|
121 4 |
112 4 |
122 5 |
113 5 |
123 >>>>>>> other: test 1 |
114 >>>>>>> other: test 1 |
124 Hop we are done. |
115 Hop we are done. |
125 |
116 |
148 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
139 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
149 [1] |
140 [1] |
150 |
141 |
151 $ cat a |
142 $ cat a |
152 Small Mathematical Series. |
143 Small Mathematical Series. |
|
144 1 |
|
145 2 |
|
146 3 |
153 <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc) |
147 <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc) |
154 1 |
148 6 |
155 2 |
149 8 |
156 3 |
150 ======= |
157 6 |
|
158 8 |
|
159 ======= |
|
160 1 |
|
161 2 |
|
162 3 |
|
163 4 |
151 4 |
164 5 |
152 5 |
165 >>>>>>> other: branch1 |
153 >>>>>>> other: branch1 |
166 Hop we are done. |
154 Hop we are done. |
167 |
155 |
177 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
165 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
178 [1] |
166 [1] |
179 |
167 |
180 $ cat a |
168 $ cat a |
181 Small Mathematical Series. |
169 Small Mathematical Series. |
|
170 1 |
|
171 2 |
|
172 3 |
182 <<<<<<< local |
173 <<<<<<< local |
183 1 |
174 6 |
184 2 |
175 8 |
185 3 |
176 ======= |
186 6 |
|
187 8 |
|
188 ======= |
|
189 1 |
|
190 2 |
|
191 3 |
|
192 4 |
177 4 |
193 5 |
178 5 |
194 >>>>>>> other |
179 >>>>>>> other |
195 Hop we are done. |
180 Hop we are done. |
196 |
181 |