simplemerge: use context paths for default labels instead of file paths
This is the last place we used the filepath arguments without first using the
context version.
Differential Revision: https://phab.mercurial-scm.org/D379
--- 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: