mercurial/filemerge.py

--- a/mercurial/filemerge.py	Wed Nov 04 09:34:04 2009 +0100
+++ b/mercurial/filemerge.py	Wed Nov 04 15:18:19 2009 +0100
@@ -186,6 +186,7 @@
     env = dict(HG_FILE=fd,
                HG_MY_NODE=short(mynode),
                HG_OTHER_NODE=str(fco.changectx()),
+               HG_BASE_NODE=str(fca.changectx()),
                HG_MY_ISLINK='l' in fcd.flags(),
                HG_OTHER_ISLINK='l' in fco.flags(),
                HG_BASE_ISLINK='l' in fca.flags())