mbthomas accepted this revision. mbthomas added a comment.
LGTM INLINE COMMENTS > merge.py:1739-1743 > + if fsmonitorwarning \ > + and not fsmonitorenabled \ > + and p1.node() == nullid \ > + and len(actions['g']) >= fsmonitorthreshold \ > + and pycompat.sysplatform.startswith(('linux', 'darwin')): I'm not sure if we're planning to work towards PEP8, but it (and I) prefer using parentheses to break long if conditionals, rather than backslashes. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D894 To: indygreg, #hg-reviewers, mbthomas Cc: mbthomas, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel