equal
deleted
inserted
replaced
47 $ cat a |
47 $ cat a |
48 Small Mathematical Series. |
48 Small Mathematical Series. |
49 1 |
49 1 |
50 2 |
50 2 |
51 3 |
51 3 |
52 <<<<<<< local: 618808747361 - test: branch2 |
52 <<<<<<< working copy: 618808747361 - test: branch2 |
53 6 |
53 6 |
54 8 |
54 8 |
55 ======= |
55 ======= |
56 4 |
56 4 |
57 5 |
57 5 |
58 >>>>>>> other: c0c68e4fe667 - test: branch1 |
58 >>>>>>> merge rev: c0c68e4fe667 - test: branch1 |
59 Hop we are done. |
59 Hop we are done. |
60 |
60 |
61 $ hg status |
61 $ hg status |
62 M a |
62 M a |
63 ? a.orig |
63 ? a.orig |
77 $ cat a |
77 $ cat a |
78 Small Mathematical Series. |
78 Small Mathematical Series. |
79 1 |
79 1 |
80 2 |
80 2 |
81 3 |
81 3 |
82 <<<<<<< local: test 2 |
82 <<<<<<< working copy: test 2 |
83 6 |
83 6 |
84 8 |
84 8 |
85 ======= |
85 ======= |
86 4 |
86 4 |
87 5 |
87 5 |
88 >>>>>>> other: test 1 |
88 >>>>>>> merge rev: test 1 |
89 Hop we are done. |
89 Hop we are done. |
90 |
90 |
91 Verify line splitting of custom conflict marker which causes multiple lines |
91 Verify line splitting of custom conflict marker which causes multiple lines |
92 |
92 |
93 $ hg up -q --clean . |
93 $ hg up -q --clean . |
103 $ cat a |
103 $ cat a |
104 Small Mathematical Series. |
104 Small Mathematical Series. |
105 1 |
105 1 |
106 2 |
106 2 |
107 3 |
107 3 |
108 <<<<<<< local: test 2 |
108 <<<<<<< working copy: test 2 |
109 6 |
109 6 |
110 8 |
110 8 |
111 ======= |
111 ======= |
112 4 |
112 4 |
113 5 |
113 5 |
114 >>>>>>> other: test 1 |
114 >>>>>>> merge rev: test 1 |
115 Hop we are done. |
115 Hop we are done. |
116 |
116 |
117 Verify line trimming of custom conflict marker using multi-byte characters |
117 Verify line trimming of custom conflict marker using multi-byte characters |
118 |
118 |
119 $ hg up -q --clean . |
119 $ hg up -q --clean . |
142 $ cat a |
142 $ cat a |
143 Small Mathematical Series. |
143 Small Mathematical Series. |
144 1 |
144 1 |
145 2 |
145 2 |
146 3 |
146 3 |
147 <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc) |
147 <<<<<<< working copy: 1234567890123456789012345678901234567890123456789012345... |
148 6 |
148 6 |
149 8 |
149 8 |
150 ======= |
150 ======= |
151 4 |
151 4 |
152 5 |
152 5 |
153 >>>>>>> other: branch1 |
153 >>>>>>> merge rev: branch1 |
154 Hop we are done. |
154 Hop we are done. |
155 |
155 |
156 Verify basic conflict markers |
156 Verify basic conflict markers |
157 |
157 |
158 $ hg up -q --clean 2 |
158 $ hg up -q --clean 2 |
168 $ cat a |
168 $ cat a |
169 Small Mathematical Series. |
169 Small Mathematical Series. |
170 1 |
170 1 |
171 2 |
171 2 |
172 3 |
172 3 |
173 <<<<<<< local |
173 <<<<<<< working copy |
174 6 |
174 6 |
175 8 |
175 8 |
176 ======= |
176 ======= |
177 4 |
177 4 |
178 5 |
178 5 |
179 >>>>>>> other |
179 >>>>>>> merge rev |
180 Hop we are done. |
180 Hop we are done. |
181 |
181 |
182 internal:merge3 |
182 internal:merge3 |
183 |
183 |
184 $ hg up -q --clean . |
184 $ hg up -q --clean . |
189 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
189 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
190 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
190 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
191 [1] |
191 [1] |
192 $ cat a |
192 $ cat a |
193 Small Mathematical Series. |
193 Small Mathematical Series. |
194 <<<<<<< local |
194 <<<<<<< working copy |
195 1 |
195 1 |
196 2 |
196 2 |
197 3 |
197 3 |
198 6 |
198 6 |
199 8 |
199 8 |
207 1 |
207 1 |
208 2 |
208 2 |
209 3 |
209 3 |
210 4 |
210 4 |
211 5 |
211 5 |
212 >>>>>>> other |
212 >>>>>>> merge rev |
213 Hop we are done. |
213 Hop we are done. |
214 |
214 |
215 Add some unconflicting changes on each head, to make sure we really |
215 Add some unconflicting changes on each head, to make sure we really |
216 are merging, unlike :local and :other |
216 are merging, unlike :local and :other |
217 |
217 |