D379: simplemerge: use context paths for default labels instead of file paths
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Fri Aug 25 06:40:37 UTC 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1915a5e809ca: simplemerge: use context paths for default labels instead of file paths (authored by phillco).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D379?vs=1039&id=1286
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
More information about the Mercurial-devel
mailing list