martinvonz added a comment. I reflowed the lines in filemerge.py in flight. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D602 To: phillco, #hg-reviewers Cc: martinvonz, mercurial-devel