Mercurial Mercurial > hg / 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-merge7.t
changeset 26618 8e6d5b7317e6
parent 26614 ef1eb6df7071
child 27161 296d55def9c4 
--- a/tests/test-merge7.t	Sun Oct 11 20:12:12 2015 -0700
+++ b/tests/test-merge7.t	Sun Oct 11 21:56:39 2015 -0700
@@ -84,10 +84,11 @@
    branchmerge: True, force: False, partial: False
    ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
    preserving test.txt for resolve of test.txt
-   test.txt: versions differ -> m
+   test.txt: versions differ -> m (premerge)
   picked tool ':merge' for test.txt (binary False symlink False)
   merging test.txt
   my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
+   test.txt: versions differ -> m (merge)
   picked tool ':merge' for test.txt (binary False symlink False)
   my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
   warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
Mercurial