--- a/tests/test-bisect2.t Mon Dec 12 17:49:48 2022 +0400
+++ b/tests/test-bisect2.t Mon Jan 02 15:27:55 2023 +0400
@@ -794,3 +794,14 @@
17:228c06deef46
18:d42e18c7bc9b
$ hg log -q -r 'bisect(untested)'
+
+in-progress bisect interacts with hg merge (issue6527)
+
+ $ hg up -r 17 -q
+ $ hg merge 7
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+ $ hg merge --abort
+ abort: cannot abort merge with bisect in progress
+ (use 'hg bisect --reset')
+ [20]