Mercurial Mercurial > public > mercurial-scm > 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-subrepo.t
changeset 30460 ce3a133f71b3
parent 30062 940c05b25b07
child 30556 c059286a0f9c 
--- a/tests/test-subrepo.t	Thu Nov 10 09:21:41 2016 -0800
+++ b/tests/test-subrepo.t	Sat Nov 19 15:41:37 2016 -0800
@@ -332,7 +332,7 @@
   conflict
   =======
   t3
-  >>>>>>> other: 7af322bc1198  - test: 7
+  >>>>>>> other: 7af322bc1198 - test: 7
 
 11: remove subrepo t
mercurial-scm/hg