Mercurial > public > mercurial-scm > hg-stable

diff mercurial/configitems.py @ 34480:99c3dee3f6ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register the 'merge.preferancestor' config
author Boris Feld <boris.feld@octobus.net>
date Fri, 30 Jun 2017 03:43:13 +0200
parents ef303daefdf7
children cbda631c1dde
line wrap: on
line diff
--- a/mercurial/configitems.py	Fri Jun 30 03:39:10 2017 +0200
+++ b/mercurial/configitems.py	Fri Jun 30 03:43:13 2017 +0200
@@ -302,6 +302,9 @@
 coreconfigitem('merge', 'followcopies',
     default=True,
 )
+coreconfigitem('merge', 'preferancestor',
+        default=lambda: ['*'],
+)
 coreconfigitem('pager', 'ignore',
     default=list,
 )