Mercurial > hg
comparison mercurial/configitems.py @ 34942:2a774cae3a03 stable
merge: disable path conflict checking by default (issue5716)
We shouldn't ship a severe perf regression in hg update for 4.4.
Differential Revision: https://phab.mercurial-scm.org/D1223
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 24 Oct 2017 11:15:30 -0700 |
parents | 37450a122128 |
children | a7e49a5b3e6f 0f5521e56b77 5e27afeddaee |
comparison
equal
deleted
inserted
replaced
34941:37450a122128 | 34942:2a774cae3a03 |
---|---|
577 ) | 577 ) |
578 coreconfigitem('merge', 'checkignored', | 578 coreconfigitem('merge', 'checkignored', |
579 default='abort', | 579 default='abort', |
580 ) | 580 ) |
581 coreconfigitem('experimental', 'merge.checkpathconflicts', | 581 coreconfigitem('experimental', 'merge.checkpathconflicts', |
582 default=True, | 582 default=False, |
583 ) | 583 ) |
584 coreconfigitem('merge', 'followcopies', | 584 coreconfigitem('merge', 'followcopies', |
585 default=True, | 585 default=True, |
586 ) | 586 ) |
587 coreconfigitem('merge', 'on-failure', | 587 coreconfigitem('merge', 'on-failure', |