Compile problems shadow.c after hg pull -u

[Robin van Leeuwen <rvl@rldsoftware.nl>]

After my last hg pull -u

hg tip
changeset:   8369:dc8122d90670
tag:         tip
user:        kaf24@firebug.cl.cam.ac.uk
date:        Wed Dec 14 19:47:16 2005 +0100
summary:     Fix the issue when guest OS clear TS bit by mov to cr0 
instead of

i got some strange errors in compiling
Xen. They where all located in the file 
/usr/src/xen/xen-unstable.hg/xen/arch/x86/shadow.c

Anyway, i have limited C experience, but the was a lot of rules in it like

 > <<<<<<< /tmp/shadow.c~base.2FTtb9
 >     need_flush |= resync_all(d, PGT_l2_shadow);
 > =======

So everywhere wehere the was a <<<<<<<, i deleted until the ===========
and everywhere there was >>>>>>>> i left (removed >>>>>> and ========) 
offcourse

my diff file before and after is attached, maybe can give some help....

seems so compile ok now (amd64, 64 bit mode)

kind regards, robin