Mercurial > hg-stable
diff tests/test-conflict.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 | c3e9269d9602 |
children | ce3a133f71b3 |
line wrap: on
line diff
--- a/tests/test-conflict.t Wed Oct 05 15:28:34 2016 +0200 +++ b/tests/test-conflict.t Fri Oct 07 08:51:50 2016 -0700 @@ -49,13 +49,13 @@ 1 2 3 - <<<<<<< local: 618808747361 - test: branch2 + <<<<<<< working copy: 618808747361 - test: branch2 6 8 ======= 4 5 - >>>>>>> other: c0c68e4fe667 - test: branch1 + >>>>>>> merge rev: c0c68e4fe667 - test: branch1 Hop we are done. $ hg status @@ -79,13 +79,13 @@ 1 2 3 - <<<<<<< local: test 2 + <<<<<<< working copy: test 2 6 8 ======= 4 5 - >>>>>>> other: test 1 + >>>>>>> merge rev: test 1 Hop we are done. Verify line splitting of custom conflict marker which causes multiple lines @@ -105,13 +105,13 @@ 1 2 3 - <<<<<<< local: test 2 + <<<<<<< working copy: test 2 6 8 ======= 4 5 - >>>>>>> other: test 1 + >>>>>>> merge rev: test 1 Hop we are done. Verify line trimming of custom conflict marker using multi-byte characters @@ -144,13 +144,13 @@ 1 2 3 - <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc) + <<<<<<< working copy: 1234567890123456789012345678901234567890123456789012345... 6 8 ======= 4 5 - >>>>>>> other: branch1 + >>>>>>> merge rev: branch1 Hop we are done. Verify basic conflict markers @@ -170,13 +170,13 @@ 1 2 3 - <<<<<<< local + <<<<<<< working copy 6 8 ======= 4 5 - >>>>>>> other + >>>>>>> merge rev Hop we are done. internal:merge3 @@ -191,7 +191,7 @@ [1] $ cat a Small Mathematical Series. - <<<<<<< local + <<<<<<< working copy 1 2 3 @@ -209,7 +209,7 @@ 3 4 5 - >>>>>>> other + >>>>>>> merge rev Hop we are done. Add some unconflicting changes on each head, to make sure we really