Show More
@@ -520,8 +520,8 b' def _xmerge(repo, mynode, orig, fcd, fco' | |||
|
520 | 520 | baselabel = 'base' |
|
521 | 521 | env = {'HG_FILE': fcd.path(), |
|
522 | 522 | 'HG_MY_NODE': short(mynode), |
|
523 |
'HG_OTHER_NODE': s |
|
|
524 |
'HG_BASE_NODE': s |
|
|
523 | 'HG_OTHER_NODE': short(fco.changectx().node()), | |
|
524 | 'HG_BASE_NODE': short(fca.changectx().node()), | |
|
525 | 525 | 'HG_MY_ISLINK': 'l' in fcd.flags(), |
|
526 | 526 | 'HG_OTHER_ISLINK': 'l' in fco.flags(), |
|
527 | 527 | 'HG_BASE_ISLINK': 'l' in fca.flags(), |
General Comments 0
You need to be logged in to leave comments.
Login now