Mercurial > hg-stable
comparison tests/test-merge7.t @ 30062:940c05b25b07
merge: add conflict labels to merge command
Now that we present the conflict labels in prompts, it's useful to have
better names than "local" and "other" for every command.
| author | Simon Farnsworth <simonfar@fb.com> |
|---|---|
| date | Fri, 07 Oct 2016 08:51:50 -0700 |
| parents | 564a354f7f35 |
| children | ce3a133f71b3 |
comparison
equal
deleted
inserted
replaced
| 30061:8e805cf27caa | 30062:940c05b25b07 |
|---|---|
| 97 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 97 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 98 [1] | 98 [1] |
| 99 | 99 |
| 100 $ cat test.txt | 100 $ cat test.txt |
| 101 one | 101 one |
| 102 <<<<<<< local: 50c3a7e29886 - test: Merge 1 | 102 <<<<<<< working copy: 50c3a7e29886 - test: Merge 1 |
| 103 two-point-five | 103 two-point-five |
| 104 ======= | 104 ======= |
| 105 two-point-one | 105 two-point-one |
| 106 >>>>>>> other: 40d11a4173a8 - test: two -> two-point-one | 106 >>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one |
| 107 three | 107 three |
| 108 | 108 |
| 109 $ hg debugindex test.txt | 109 $ hg debugindex test.txt |
| 110 rev offset length ..... linkrev nodeid p1 p2 (re) | 110 rev offset length ..... linkrev nodeid p1 p2 (re) |
| 111 0 0 7 ..... 0 01365c4cca56 000000000000 000000000000 (re) | 111 0 0 7 ..... 0 01365c4cca56 000000000000 000000000000 (re) |