Mercurial > public > mercurial-scm > hg

diff tests/test-merge-remove.t @ 39285: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 cb70501d8b71
line wrap: on
line diff
--- a/tests/test-merge-remove.t	Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-merge-remove.t	Sun Aug 26 19:14:26 2018 +0300
@@ -102,7 +102,7 @@
 Those who use force will lose
 
   $ hg merge -f
-  file 'bar' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'bar' was deleted in local [working copy] but was modified in other [merge rev].
   What do you want to do?
   use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
   merging foo1 and foo to foo1