##// END OF EJS Templates
merge: supply base node to merge tools in the environment...
Sune Foldager -
r9709:5858117a default
parent child Browse files
Show More
@@ -186,6 +186,7 b' def filemerge(repo, mynode, orig, fcd, f'
186 env = dict(HG_FILE=fd,
186 env = dict(HG_FILE=fd,
187 HG_MY_NODE=short(mynode),
187 HG_MY_NODE=short(mynode),
188 HG_OTHER_NODE=str(fco.changectx()),
188 HG_OTHER_NODE=str(fco.changectx()),
189 HG_BASE_NODE=str(fca.changectx()),
189 HG_MY_ISLINK='l' in fcd.flags(),
190 HG_MY_ISLINK='l' in fcd.flags(),
190 HG_OTHER_ISLINK='l' in fco.flags(),
191 HG_OTHER_ISLINK='l' in fco.flags(),
191 HG_BASE_ISLINK='l' in fca.flags())
192 HG_BASE_ISLINK='l' in fca.flags())
General Comments 0
You need to be logged in to leave comments. Login now