durin42 added a comment.
In https://phab.mercurial-scm.org/D30#1098, @quark wrote: > > Is it important that the error be deterministic? > > Good question. Deterministic error is just to make tests stable AFAIK. If the perf win is noticable, I personally prefer perf win. We can use `(glob)` and `(?)` in tests to make it support non-deterministic outputs. Historically we've biased to keeping `merge` deterministic so it's easy to reproduce bugs. I'd very much like to keep that property. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D30 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/ To: alex_gaynor, durin42, dsp Cc: quark, krbullock, dsp, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel