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-conflict.t
changeset 30460 ce3a133f71b3
parent 30062 940c05b25b07
child 32047 458f7294dfee 
--- a/tests/test-conflict.t	Thu Nov 10 09:21:41 2016 -0800
+++ b/tests/test-conflict.t	Sat Nov 19 15:41:37 2016 -0800
@@ -55,7 +55,7 @@
   =======
   4
   5
-  >>>>>>> merge rev:    c0c68e4fe667  - test: branch1
+  >>>>>>> merge rev:    c0c68e4fe667 - test: branch1
   Hop we are done.
 
   $ hg status
mercurial