equal
deleted
inserted
replaced
576 default='abort', |
576 default='abort', |
577 ) |
577 ) |
578 coreconfigitem('merge', 'checkignored', |
578 coreconfigitem('merge', 'checkignored', |
579 default='abort', |
579 default='abort', |
580 ) |
580 ) |
|
581 coreconfigitem('experimental', 'merge.checkpathconflicts', |
|
582 default=True, |
|
583 ) |
581 coreconfigitem('merge', 'followcopies', |
584 coreconfigitem('merge', 'followcopies', |
582 default=True, |
585 default=True, |
583 ) |
586 ) |
584 coreconfigitem('merge', 'on-failure', |
587 coreconfigitem('merge', 'on-failure', |
585 default='continue', |
588 default='continue', |