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-rename-merge2.t
changeset 39285 a3fd84f4fb38
parent 39284 975d959295ef
child 39429 7450f6500b6e 
--- a/tests/test-rename-merge2.t	Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-rename-merge2.t	Sun Aug 26 19:14:26 2018 +0300
@@ -692,7 +692,7 @@
   starting 4 threads for background file closing (?)
    a: prompt deleted/changed -> m (premerge)
   picked tool ':prompt' for a (binary False symlink False changedelete True)
-  file 'a' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'a' 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
    b: both created -> m (premerge)
@@ -738,7 +738,7 @@
   starting 4 threads for background file closing (?)
    a: prompt changed/deleted -> m (premerge)
   picked tool ':prompt' for a (binary False symlink False changedelete True)
-  file 'a' was deleted in local [working copy] but was modified in other [merge rev].
+  file 'a' 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
    b: both created -> m (premerge)
mercurial