Mercurial > public > mercurial-scm > hg-stable

diff mercurial/configitems.py @ 34796:ed91846c29cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: introduce functions to halt merge flow Depends on D931. This patch introduces functions and a config option that will allow a user to halt the merge if there are failures during a file merge. These functions will be used in the next patch. Differential Revision: https://phab.mercurial-scm.org/D932
author Ryan McElroy <rmcelroy@fb.com>
date Fri, 06 Oct 2017 06:48:43 -0700
parents 48d2b396cf6c
children c4a0480d1951
line wrap: on
line diff
--- a/mercurial/configitems.py	Sun Oct 15 19:29:56 2017 +0530
+++ b/mercurial/configitems.py	Fri Oct 06 06:48:43 2017 -0700
@@ -531,6 +531,9 @@
 coreconfigitem('merge', 'followcopies',
     default=True,
 )
+coreconfigitem('merge', 'on-failure',
+    default='continue',
+)
 coreconfigitem('merge', 'preferancestor',
         default=lambda: ['*'],
 )