# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1595374881 -28800
# Node ID 0d65a5e96691dadd0c9cbccffe39c417d6332b09
# Parent  58b0dfc6dd5274ada0f9b8281c712fd14a313052
tests: new error message format for rebase

CORE-TEST-OUTPUT-UPDATE: dc5e5577af39

diff -r 58b0dfc6dd52 -r 0d65a5e96691 tests/test-topic-rebase.t
--- a/tests/test-topic-rebase.t	Sat Jul 04 21:02:37 2020 +0800
+++ b/tests/test-topic-rebase.t	Wed Jul 22 07:41:21 2020 +0800
@@ -127,7 +127,7 @@
   merging file
   warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
   switching to topic myotherfeature
-  unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [1]
 
 Resolve the conflict