mercurial/filemerge.py
changeset 36424 3ab9d74dd1c5
parent 35907 9037c29e9f53
child 36835 5bc7ff103081
equal deleted inserted replaced
36423:2831d918e1b4 36424:3ab9d74dd1c5
   518             baselabel = labels[2]
   518             baselabel = labels[2]
   519         else:
   519         else:
   520             baselabel = 'base'
   520             baselabel = 'base'
   521         env = {'HG_FILE': fcd.path(),
   521         env = {'HG_FILE': fcd.path(),
   522                'HG_MY_NODE': short(mynode),
   522                'HG_MY_NODE': short(mynode),
   523                'HG_OTHER_NODE': str(fco.changectx()),
   523                'HG_OTHER_NODE': short(fco.changectx().node()),
   524                'HG_BASE_NODE': str(fca.changectx()),
   524                'HG_BASE_NODE': short(fca.changectx().node()),
   525                'HG_MY_ISLINK': 'l' in fcd.flags(),
   525                'HG_MY_ISLINK': 'l' in fcd.flags(),
   526                'HG_OTHER_ISLINK': 'l' in fco.flags(),
   526                'HG_OTHER_ISLINK': 'l' in fco.flags(),
   527                'HG_BASE_ISLINK': 'l' in fca.flags(),
   527                'HG_BASE_ISLINK': 'l' in fca.flags(),
   528                'HG_MY_LABEL': mylabel,
   528                'HG_MY_LABEL': mylabel,
   529                'HG_OTHER_LABEL': otherlabel,
   529                'HG_OTHER_LABEL': otherlabel,