errors: raise StateError when there are unresolves merge conflicts

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

mercurial/mergeutil.py

@@ -14,6 +14,6 b' from . import error'
 
 def checkunresolved(ms):
     if list(ms.unresolved()):
-        raise error.Abort(
+        raise error.StateError(
             _(b"unresolved merge conflicts (see 'hg help resolve')")
         )

tests/test-commit-amend.t

@@ -423,7 +423,7 b' Refuse to amend if there is a merge conf'
 
   $ hg ci --amend
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
 
   $ hg up -qC .
 

tests/test-commit-unresolved.t

@@ -101,7 +101,7 b' Correct the conflict without marking the'
   $ echo "ABCD" > A
   $ hg commit -m "Merged"
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
 
 Mark the conflict as resolved and commit
 
@@ -123,7 +123,7 b' Test that if a file is removed but not m'
   $ hg rm --force A
   $ hg commit -m merged
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
 
   $ hg resolve -ma
   (no more unresolved files)

tests/test-graft.t

@@ -324,7 +324,7 b' Continue without resolve should fail:'
   $ hg graft -c
   grafting 4:9c233e8e184d "4"
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
 
 Fix up:
 

tests/test-rebase-conflicts.t

@@ -89,7 +89,7 b' Try to continue without solving the conf'
 
   $ hg rebase --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
 
 Conclude rebase:
 

tests/test-update-branches.t

@@ -348,7 +348,7 b' Try to make empty commit while there are'
   $ rm a.orig
   $ hg ci -m empty
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
   $ hg resolve -m a
   (no more unresolved files)
   $ hg resolve -l