Skip to content
Snippets Groups Projects
Commit 9e6ac107ab28 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

copies-tests: update to null in test-copies-chain-merge.t

This avoid some unrelated output changeset when adding more cases.

Differential Revision: https://phab.mercurial-scm.org/D9589
parent dd0905b99b47
No related branches found
No related tags found
No related merge requests found
......@@ -637,6 +637,8 @@
Summary of all created cases
----------------------------
$ hg up --quiet null
(This exists to help keeping a compact list of the various cases we have built)
$ hg log -T '{desc|firstline}\n'| sort
......@@ -1706,7 +1708,7 @@
(the copy information from the branch that was not deleted should win).
$ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))'
@ 36 mHC-delete-before-conflict-m-0
o 36 mHC-delete-before-conflict-m-0
|\
+---o 35 mCH-delete-before-conflict-m-0
| |/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment