Mercurial Mercurial > hg-stable / 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-copies-chain-merge.t
changeset 44464 7b1f516e7606
parent 44463 bc1786973c6d
child 44471 68e14fecd82a 
--- a/tests/test-copies-chain-merge.t	Tue Mar 03 08:55:27 2020 +0100
+++ b/tests/test-copies-chain-merge.t	Sat Feb 29 19:31:33 2020 +0100
@@ -299,8 +299,9 @@
 
 final summary
 
+  $ hg update null --quiet
   $ hg log -G
-  @    20 mEAm-0 simple merge - the other way]
+  o    20 mEAm-0 simple merge - the other way]
   |\
   +---o  19 mAEm-0 simple merge - one way]
   | |/
hg-stable