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 42602 c7d236b55a3e
parent 42532 12243f15d53e
child 42897 d7304434390f 
--- a/tests/test-rebase-conflicts.t	Sun Jul 14 01:31:42 2019 -0400
+++ b/tests/test-rebase-conflicts.t	Sun Jul 14 23:21:28 2019 -0700
@@ -324,8 +324,8 @@
   bundle2-input-part: total payload size 24
   bundle2-input-bundle: 2 parts total
   updating the branch cache
-  invalid branchheads cache (served): tip differs
-  invalid branchheads cache (served.hidden): tip differs
+  invalid branch cache (served): tip differs
+  invalid branch cache (served.hidden): tip differs
   rebase completed
 
 Test minimization of merge conflicts
mercurial