Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge-subrepos.t @ 39304:f785073f792c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: improve interactive one-changed one-deleted message (issue5550) I like the wording from the bug, so I figured I'd package it up in a change and see what people think. Differential Revision: https://phab.mercurial-scm.org/D4336
author Augie Fackler <augie@google.com>
date Mon, 20 Aug 2018 13:29:48 -0400
parents 4441705b7111
children 975d959295ef
line wrap: on
line diff
--- a/tests/test-merge-subrepos.t	Thu Aug 16 17:19:27 2018 +0200
+++ b/tests/test-merge-subrepos.t	Mon Aug 20 13:29:48 2018 -0400
@@ -110,7 +110,8 @@
   $ hg up -r '.^' --config ui.interactive=True << EOF
   > d
   > EOF
-  other [destination] changed b which local [working copy] deleted
+  file b was deleted in other [destination] but was modified in local [working copy].
+  What do you want to do?
   use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved