this morning i get a
Updating 32e197701..75ee544f9
error: Your local changes to the following files would be overwritten by merge:
src/testdir/test_clientserver.vim
Please commit your changes or stash them before you merge.
Aborting
when i try to git pull
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/CALfSX1xpiO%2BwHTjbO3PV5Z2C-eq%2BnuDhcWvvBFu3Up%3DF9QZxbQ%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.
