diff tests/test-subrepo-git.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.

--- a/tests/test-subrepo-git.t	Wed Oct 05 15:28:34 2016 +0200
+++ b/tests/test-subrepo-git.t	Fri Oct 07 08:51:50 2016 -0700
@@ -171,7 +171,7 @@
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge 2>/dev/null
    subrepository s diverged (local revision: 7969594, remote revision: aa84837)
-  (M)erge, keep (l)ocal or keep (r)emote? m
+  (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m
   pulling subrepo s from $TESTTMP/gitroot
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)