Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 45917:721f765a34ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: raise StateError on uncommitted changes when merge starts Differential Revision: https://phab.mercurial-scm.org/D9393
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 23:08:58 -0800
parents 58e7ee23ddbd
children 10dbc80d4be7
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Nov 23 16:48:13 2020 -0800
+++ b/mercurial/merge.py	Mon Nov 23 23:08:58 2020 -0800
@@ -1912,7 +1912,7 @@
                         hint=_(b"use 'hg update' or check 'hg heads'"),
                     )
             if not force and (wc.files() or wc.deleted()):
-                raise error.Abort(
+                raise error.StateError(
                     _(b"uncommitted changes"),
                     hint=_(b"use 'hg status' to list changes"),
                 )