Mercurial > hg

diff tests/test-rename-dir-merge.t @ 30062:940c05b25b07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-rename-dir-merge.t	Wed Oct 05 15:28:34 2016 +0200
+++ b/tests/test-rename-dir-merge.t	Fri Oct 07 08:51:50 2016 -0700
@@ -144,11 +144,11 @@
   C b/a
   C b/b
   $ cat b/c
-  <<<<<<< local: f1c50ca4f127 - test: new file in target directory
+  <<<<<<< working copy: f1c50ca4f127 - test: new file in target directory
   target
   =======
   baz
-  >>>>>>> other: ce36d17b18fb  - test: 2 add a/c
+  >>>>>>> merge rev:    ce36d17b18fb  - test: 2 add a/c
   $ rm b/c.orig
 
 Remote directory rename with conflicting file added in remote target directory
@@ -177,11 +177,11 @@
   ? a/d
   ? b/c.orig
   $ cat b/c
-  <<<<<<< local: ce36d17b18fb  - test: 2 add a/c
+  <<<<<<< working copy: ce36d17b18fb  - test: 2 add a/c
   baz
   =======
   target
-  >>>>>>> other: f1c50ca4f127 - test: new file in target directory
+  >>>>>>> merge rev:    f1c50ca4f127 - test: new file in target directory
 
 Second scenario with two repos: