Mercurial > hg-stable
comparison tests/test-diff-newlines.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 | aaa1f8f514cf |
| children | 5abc47d4ca6b |
comparison
equal
deleted
inserted
replaced
| 34941:37450a122128 | 34942:2a774cae3a03 |
|---|