--- a/tests/test-prev-next.t	Sun Jun 03 02:37:13 2018 +0530
+++ b/tests/test-prev-next.t	Sun Jun 03 03:13:47 2018 +0530
@@ -419,3 +419,23 @@
   @@ -1,1 +1,1 @@
   -hi
   +bar
+
+test that we dont end up in merge conflicts
+
+  $ echo bar > bar
+  $ hg prev
+  abort: conflicting changes
+  (commit or update --clean to discard changes)
+  [255]
+
+  $ echo hi > bar
+  $ hg prev
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  [1] added foo
+  $ echo bar > bar
+  $ hg add bar
+
+  $ hg next
+  abort: conflicting changes
+  (commit or update --clean to discard changes)
+  [255]