Originally Posted by R. Belmont
You hit a merge violation. Delete the files and re-get from SVN.

src\emu\cpu\ folder deleted and re-downloaded from SVN. It seems to work now.
Thanks to take care about my problem. smile