equal
deleted
inserted
replaced
678 --- file2 --- |
678 --- file2 --- |
679 2 |
679 2 |
680 changed |
680 changed |
681 --- file3 --- |
681 --- file3 --- |
682 3 |
682 3 |
683 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... |
683 <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, c... |
684 changed2 |
684 changed2 |
685 ||||||| base: ab57bf49aa27 - test: added files |
685 ||||||| common ancestor: ab57bf49aa27 - test: added files |
686 ======= |
686 ======= |
687 changed1 |
687 changed1 |
688 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... |
688 >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, c... |
689 |
689 |
690 Exercise transitions between local, other, fail and prompt, and make sure the |
690 Exercise transitions between local, other, fail and prompt, and make sure the |
691 dirstate stays consistent. (Compare with each other and to the above |
691 dirstate stays consistent. (Compare with each other and to the above |
692 invocations.) |
692 invocations.) |
693 |
693 |