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-rebase-conflicts.t
changeset 48584 74973a6d4e67
parent 46794 e2f7b2695ba1
child 48588 402a6b6173e9 
--- a/tests/test-rebase-conflicts.t	Thu Jan 20 13:43:43 2022 -0800
+++ b/tests/test-rebase-conflicts.t	Thu Jan 20 14:13:12 2022 -0800
@@ -374,7 +374,7 @@
    a
   +<<<<<<< dest:   328e4ab1f7cc ab - test: ab
    b
-  +||||||| base
+  +||||||| base:   cb9a9f314b8b - test: a
   +=======
   +b
   +c
mercurial