# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1527975827 -19800
# Node ID 31348460646119591434ffdc0dadfd45e866d30e
# Parent  27cf636b2f4d31bf64cb9ee4591160e798523843
tests: add tests for conflicts while respecting commands.update.check

This patch adds tests to check that we don't run into conflicts while respecting
commands.update.check.

The error message now does not show the hint about --merge option which we
should fix.

diff -r 27cf636b2f4d -r 313484606461 tests/test-prev-next.t
--- 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]