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 34661 eb586ed5d8ce
parent 30460 ce3a133f71b3
child 35704 41ef02ba329b 
--- a/tests/test-merge7.t	Fri Oct 13 21:36:10 2017 +0900
+++ b/tests/test-merge7.t	Thu Oct 12 09:39:50 2017 +0200
@@ -41,6 +41,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  new changesets 96b70246a118
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge
   merging test.txt
@@ -77,6 +78,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  new changesets 40d11a4173a8
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg merge --debug
     searching for copies back to rev 1
Mercurial