# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2018-08-17 01:19:17
# Node ID e338a921a0cdc60717e5aebc7dc4bb9ba203478d
# Parent  06baaf43c9599534ffe3b6ecd3275e68abe68c34

rebase: add test for in-memory merge conflicts

diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -351,6 +351,19 @@ Check dryrun working with --collapse whe
   hit a merge conflict
   [1]
 
+In-memory rebase that fails due to merge conflicts
+
+  $ hg rebase -s 2 -d 7
+  rebasing 2:177f92b77385 "c"
+  rebasing 3:055a42cdd887 "d"
+  rebasing 4:e860deea161a "e"
+  merging e
+  transaction abort!
+  rollback completed
+  hit merge conflicts; re-running rebase without in-memory merge
+  abort: abort and continue do not allow specifying revisions
+  [255]
+
 ==========================
 Test for --confirm option|
 ==========================