Mercurial > hg

changeset 33904:1915a5e809ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Phil Cohen <phillco@fb.com>
date Thu, 24 Aug 2017 21:30:37 -0700
parents ed6f64173121
children 61b267a99fea
files mercurial/simplemerge.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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: