Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge-remove.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 978b907d9b36
children 41ef02ba329b
line wrap: on
line diff
--- a/tests/test-merge-remove.t	Wed Oct 05 15:28:34 2016 +0200
+++ b/tests/test-merge-remove.t	Fri Oct 07 08:51:50 2016 -0700
@@ -102,7 +102,7 @@
 Those who use force will lose
 
   $ hg merge -f
-  other changed bar which local deleted
+  other [merge rev] changed bar which local [working copy] deleted
   use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
   merging foo1 and foo to foo1
   0 files updated, 1 files merged, 0 files removed, 1 files unresolved