ryanmce added inline comments. INLINE COMMENTS > mbthomas wrote in filemerge.py:537 > Typo: `nonrzero`. doh! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D789 To: ryanmce, #hg-reviewers, quark, yuja, mbthomas Cc: mbthomas, yuja, quark, mercurial-devel