phillco updated this revision to Diff 1039. REPOSITORY rHG Mercurial
CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D379?vs=860&id=1039 REVISION DETAIL https://phab.mercurial-scm.org/D379 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py --- a/mercurial/simplemerge.py +++ b/mercurial/simplemerge.py @@ -461,8 +461,8 @@ mode = opts.get('mode','merge') name_a, name_b, name_base = None, None, None if mode != 'union': - name_a, name_b, name_base = _picklabels([localfile, - otherfile, None], + name_a, name_b, name_base = _picklabels([localctx.path(), + otherctx.path(), None], opts.get('label', [])) try: To: phillco, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
