Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge-subrepos.t @ 39312:a3fd84f4fb38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: fix the wrong placements of messages in prompt Mistakenly, the local-changed-other-deleted-message was put in other-change-local-deleted and vice versa. This followups on D4336. Thanks to Yuya who spotted this. Differential Revision: https://phab.mercurial-scm.org/D4375
author Pulkit Goyal <pulkit@yandex-team.ru>
date Sun, 26 Aug 2018 19:14:26 +0300
parents 975d959295ef
children 1de3364320af
line wrap: on
line diff
--- a/tests/test-merge-subrepos.t	Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-merge-subrepos.t	Sun Aug 26 19:14:26 2018 +0300
@@ -110,7 +110,7 @@
   $ hg up -r '.^' --config ui.interactive=True << EOF
   > d
   > EOF
-  file 'b' was deleted in other [destination] but was modified in local [working copy].
+  file 'b' was deleted in local [working copy] but was modified in other [destination].
   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