changeset 33904 | 1915a5e809ca |
parent 33902 | f39ba8237ed6 |
child 33905 | 61b267a99fea |
--- a/mercurial/simplemerge.py Thu Aug 24 21:30:37 2017 -0700 +++ b/mercurial/simplemerge.py Thu Aug 24 21:30:37 2017 -0700 @@ -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: