equal
deleted
inserted
replaced
105 3 |
105 3 |
106 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
106 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
107 changed2 |
107 changed2 |
108 ======= |
108 ======= |
109 changed1 |
109 changed1 |
110 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, cha... |
110 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... |
111 |
111 |
112 |
112 |
113 Interactive merge: |
113 Interactive merge: |
114 |
114 |
115 $ hg co -C |
115 $ hg co -C |
169 3 |
169 3 |
170 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
170 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
171 changed2 |
171 changed2 |
172 ======= |
172 ======= |
173 changed1 |
173 changed1 |
174 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, cha... |
174 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... |
175 |
175 |
176 |
176 |
177 Interactive merge with bad input: |
177 Interactive merge with bad input: |
178 |
178 |
179 $ hg co -C |
179 $ hg co -C |
245 3 |
245 3 |
246 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
246 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
247 changed2 |
247 changed2 |
248 ======= |
248 ======= |
249 changed1 |
249 changed1 |
250 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, cha... |
250 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... |
251 |
251 |
252 |
252 |
253 Interactive merge with not enough input: |
253 Interactive merge with not enough input: |
254 |
254 |
255 $ hg co -C |
255 $ hg co -C |
308 3 |
308 3 |
309 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
309 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
310 changed2 |
310 changed2 |
311 ======= |
311 ======= |
312 changed1 |
312 changed1 |
313 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, cha... |
313 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... |
314 |
314 |
315 Choose local versions of files |
315 Choose local versions of files |
316 |
316 |
317 $ hg co -C |
317 $ hg co -C |
318 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
318 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
633 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
633 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
634 changed2 |
634 changed2 |
635 ||||||| base |
635 ||||||| base |
636 ======= |
636 ======= |
637 changed1 |
637 changed1 |
638 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, cha... |
638 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... |
639 |
639 |
640 Exercise transitions between local, other, fail and prompt, and make sure the |
640 Exercise transitions between local, other, fail and prompt, and make sure the |
641 dirstate stays consistent. (Compare with each other and to the above |
641 dirstate stays consistent. (Compare with each other and to the above |
642 invocations.) |
642 invocations.) |
643 |
643 |