--- a/tests/test-prev-next.t Fri Apr 05 22:28:07 2019 +0200
+++ b/tests/test-prev-next.t Tue Apr 02 12:41:57 2019 +0530
@@ -443,7 +443,6 @@
Test that --merge still works fine with commands.update.check set
-XXX: yes we want --merge and we passed that!
$ hg config commands.update.check
noconflict
$ echo hi > bar
@@ -465,7 +464,6 @@
Testing --merge works with other values of commands.update.check also
-XXX: things are broken!
$ hg prev --config commands.update.check=abort
abort: uncommitted changes
(do you want --merge?)