Mercurial > hg

diff tests/test-sparse-merges.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 c6eb2118f44f
line wrap: on
line diff
--- a/tests/test-sparse-merges.t	Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-sparse-merges.t	Sun Aug 26 19:14:26 2018 +0300
@@ -113,7 +113,7 @@
 
   $ hg merge
   temporarily included 1 file(s) in the sparse checkout for merging
-  file 'd' was deleted in local [working copy] but was modified in other [merge rev].
+  file 'd' was deleted in other [merge rev] but was modified in local [working copy].
   What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved