diff tests/test-resolve.t @ 39392:5d00e6061ba2

resolve: add a flag for the default behavior of re-merging

On its own, it's not useful, but the next commit will add an hgrc
config option to make it mandatory.

There is no short option, as -r almost always means --rev and this
option doesn't seem like it would be so common as to mandate a short
option.

Differential Revision: https://phab.mercurial-scm.org/D4378

--- a/tests/test-resolve.t	Sat Sep 01 02:01:55 2018 -0400
+++ b/tests/test-resolve.t	Sun Aug 26 15:52:34 2018 -0400
@@ -442,6 +442,18 @@
   $ hg resolve -l
   R file1
   R file2
+Testing the --re-merge flag
+  $ hg resolve --unmark file1
+  $ hg resolve -l
+  U file1
+  R file2
+  $ hg resolve --mark --re-merge
+  abort: too many options specified
+  [255]
+  $ hg resolve --re-merge --all
+  merging file1
+  warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
+  [1]
 
   $ cd ..