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-sparse.t
changeset 48588 402a6b6173e9
parent 47708 7bdfd88251c0
child 48589 a51c522c0064 
--- a/tests/test-sparse.t	Thu Jan 20 11:06:52 2022 -0800
+++ b/tests/test-sparse.t	Tue Jan 18 14:57:15 2022 -0800
@@ -211,11 +211,11 @@
   hide
 
   $ cat hide
-  <<<<<<< dest:   39278f7c08a9 - test: two
+  <<<<<<< dest:             39278f7c08a9 - test: two
   y
   =======
   z
-  >>>>>>> source: b91df4f39e75 - test: edit hide
+  >>>>>>> source:           b91df4f39e75 - test: edit hide
 
 Verify aborting a rebase cleans up temporary files
mercurial