pulkit added inline comments. INLINE COMMENTS
> hg.py:1144 > unresolved conflicts.""" > - stats = mergemod.merge(repo[node], force=force, labels=labels,) > + stats = mergemod.merge(repo[node], force=force, labels=labels) > _showstats(repo, stats) This seems like unrelated change, I guess it should be part of previous patch. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8169/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8169 To: martinvonz, #hg-reviewers Cc: pulkit, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
