Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/tests/test-merge7.t Wed Oct 05 15:28:34 2016 +0200 +++ b/tests/test-merge7.t Fri Oct 07 08:51:50 2016 -0700 @@ -99,11 +99,11 @@ $ cat test.txt one - <<<<<<< local: 50c3a7e29886 - test: Merge 1 + <<<<<<< working copy: 50c3a7e29886 - test: Merge 1 two-point-five ======= two-point-one - >>>>>>> other: 40d11a4173a8 - test: two -> two-point-one + >>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one three $ hg debugindex test.txt