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-diff-change.t
changeset 48584 74973a6d4e67
parent 48030 7d908ee19b5b 
--- a/tests/test-diff-change.t	Thu Jan 20 13:43:43 2022 -0800
+++ b/tests/test-diff-change.t	Thu Jan 20 14:13:12 2022 -0800
@@ -284,7 +284,7 @@
    7
   -<<<<<<< local: fd1f17c90d7c - test: new file
    z
-  -||||||| base
+  -||||||| base:  ae119d680c82 - test: lots of text
   -8
   -=======
   -y
mercurial