Commit 2000107b authored by Pierre-Yves David's avatar Pierre-Yves David 🐙
Browse files

test: adjust output to current stable

By keeping a changeset visible longer, the `tip` is no longer at location it was
previously. This is harmess for the test itself.


CORE-TEST-OUTPUT-UPDATE: aaeccdb6e654

--HG--
branch : stable
parent 452651e69848
Pipeline #10230 passed with stage
in 5 minutes and 24 seconds
......@@ -509,7 +509,6 @@ Testing when different parent, merging conflict:
$ hg par
changeset: 5:e800202333a4
tag: tip
parent: 2:155349b645be
user: test
date: Thu Jan 01 00:00:00 1970 +0000
......@@ -627,7 +626,6 @@ Testing when different parent, conflict in relocation and merging:
$ hg par
changeset: 5:e800202333a4
tag: tip
parent: 2:155349b645be
user: test
date: Thu Jan 01 00:00:00 1970 +0000
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment