tests/test-rebase-inmemory.t
changeset 38443 e6b643ccf87d
parent 38372 f4f1fb1cbfb4
child 38498 c892a30bafb9
--- a/tests/test-rebase-inmemory.t	Fri Mar 24 00:33:35 2017 -0400
+++ b/tests/test-rebase-inmemory.t	Sat Jun 23 08:59:18 2018 +0530
@@ -287,6 +287,7 @@
   rollback completed
   hit a merge conflict
   rebase aborted
+  [1]
   $ hg diff
   $ hg status
   $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
@@ -322,3 +323,4 @@
   merging e
   hit a merge conflict
   rebase aborted
+  [1]