resolve: abort when not applicable (BC) The resolve command is only relevant when mergestate is present. This patch will make resolve abort when no mergestate is present. This change will let people know when they are using resolve when they shouldn't be. This change will let people know when their use of resolve doesn't do anything. Previously, |hg resolve -m| would allow mergestate to be created. This patch now forbids that. Strictly speaking, this is backwards incompatible. The author of this patch believes creating mergestate via resolve doesn't make much sense and this side-effect was unintended.

--- a/tests/test-resolve.t	Fri Apr 18 18:26:42 2014 -0700
+++ b/tests/test-resolve.t	Fri Apr 18 19:08:32 2014 -0700
@@ -37,9 +37,11 @@
   $ hg resolve -m file
   $ hg commit -m 'resolved'
 
-resolve -l, should be empty
+resolve -l should error since no merge in progress
 
   $ hg resolve -l
+  abort: resolve command not applicable when not merging
+  [255]
 
 test crashed merge with empty mergestate