"error: Entry 'runtime/doc/tags' not uptodate. Cannot merge." with vim_mainline git repository

Hi!

I use the vim_mainline git repository at
http://repo.or.cz/w/vim_mainline.git to get the vim sources.
Since a few days I get an "error: Entry 'runtime/doc/tags' not uptodate. Cannot merge." message when I do git pull.
Because I use this working tree just to compile Vim I didn't change this file on purpose.

How can I restore the version in the vim_mainline repository?
And what could have caused this error?

Regards,
Dennis Benzinger

--
You received this message from the "vim_use" maillist.
For more information, visit http://www.vim.org/maillist.php