phillco marked an inline comment as done. phillco added inline comments. INLINE COMMENTS > martinvonz wrote in merge.py:664 > Should this also short-circuit? Good catch, thanks. REVISION DETAIL https://phab.mercurial-scm.org/D1214 To: phillco, #hg-reviewers Cc: mercurial-devel, martinvonz