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-criss-cross.t
changeset 26611 a5ff66e6d77a
parent 26517 d8463a743d7d
child 26618 8e6d5b7317e6 
--- a/tests/test-merge-criss-cross.t	Sun Oct 11 20:04:40 2015 -0700
+++ b/tests/test-merge-criss-cross.t	Sun Oct 11 20:47:14 2015 -0700
@@ -86,6 +86,8 @@
   picked tool ':dump' for f2 (binary False symlink False)
   merging f2
   my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c
+  picked tool ':dump' for f2 (binary False symlink False)
+  my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
mercurial