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-commit-amend.t
changeset 39285 a3fd84f4fb38
parent 39284 975d959295ef
child 42213 618b9ffefa87 
--- a/tests/test-commit-amend.t	Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-commit-amend.t	Sun Aug 26 19:14:26 2018 +0300
@@ -824,7 +824,7 @@
   $ hg merge -q bar --config ui.interactive=True << EOF
   > c
   > EOF
-  file 'aa' was deleted in local [working copy] but was modified in other [merge rev].
+  file 'aa' 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? c
   $ hg ci -m 'merge bar (with conflicts)'
mercurial