--- a/tests/test-prev-next.t	Tue Jun 23 15:32:47 2015 -0700
+++ b/tests/test-prev-next.t	Tue Jun 23 15:26:51 2015 -0700
@@ -82,3 +82,25 @@
   $ hg bookmarks
      mark                      2:4e26ef31f919
      no-move                   2:4e26ef31f919
+
+
+Behavior with local modification
+--------------------------------
+
+  $ echo foo > modified-bar
+  $ hg add modified-bar
+  $ hg prev
+  abort: uncommitted changes
+  (do you want --merge?)
+  [255]
+  $ hg prev --merge
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  [0] added a
+  $ hg next
+  abort: uncommitted changes
+  (do you want --merge?)
+  [255]
+  $ hg next --merge
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  [1] added b
+