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-copy-move-merge.t
changeset 26618 8e6d5b7317e6
parent 26517 d8463a743d7d
child 27161 296d55def9c4 
--- a/tests/test-copy-move-merge.t	Sun Oct 11 20:12:12 2015 -0700
+++ b/tests/test-copy-move-merge.t	Sun Oct 11 21:56:39 2015 -0700
@@ -34,12 +34,12 @@
    preserving a for resolve of b
    preserving a for resolve of c
   removing a
-   b: remote moved from a -> m
+   b: remote moved from a -> m (premerge)
   picked tool ':merge' for b (binary False symlink False)
   merging a and b to b
   my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
    premerge successful
-   c: remote moved from a -> m
+   c: remote moved from a -> m (premerge)
   picked tool ':merge' for c (binary False symlink False)
   merging a and c to c
   my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
mercurial