# HG changeset patch # User Anton Shestakov # Date 1570670561 -25200 # Node ID d3ad50b40a4ed2f751fe93eae46699426a3aee43 # Parent 38079b848657f4732c33ad5fa42f9065dfc4ba8b tests: add the new "-r" bit to the usual merge hint CORE-TEST-OUTPUT-UPDATE: 8197b395710e diff -r 38079b848657 -r d3ad50b40a4e tests/test-topic-tutorial.t --- a/tests/test-topic-tutorial.t Sat Oct 05 14:31:19 2019 -0400 +++ b/tests/test-topic-tutorial.t Thu Oct 10 08:22:41 2019 +0700 @@ -477,7 +477,7 @@ $ hg merge abort: branch 'default' has one head - please merge with an explicit rev - (run 'hg heads' to see all heads) + (run 'hg heads' to see all heads, specify rev with -r) [255] But the topic will see that branch head as a valid destination: