diff tests/test-rebase-mq.t @ 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 3b7cb3d17137
children 469b06b4c3ca
line wrap: on
line diff