comparison tests/bruterebase.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 bab82c43c065
children 3b98ffd2dde3
comparison
equal deleted inserted replaced
34941:37450a122128 34942:2a774cae3a03