Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-subrepos.t
changeset 39285 a3fd84f4fb38
parent 39284 975d959295ef
child 40992 1de3364320af 
--- 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
mercurial