On 23/12/28 3:48 PM, tooth pik wrote:
is anyone else getting this:
I don't use github, but in mercurial I frequently get "modified" status
for a file in src/po after some combo of pull/build/update. I revert the
file to get rid of the change. Not sure what causes it, build/makefile?
-ernie
Updating 7d0abf2cb..7e4f62a25
error: Your local changes to the following files would be overwritten
by merge:
src/po/ru.cp1251.po
Please commit your local changes or stash them before you merge.
Aborting
--
--
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 [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/CALfSX1xEnVco0KxsKu443pGv0OqefyPC%3DsuvDQUjdqZTRsCphw%40mail.gmail.com
<https://groups.google.com/d/msgid/vim_dev/CALfSX1xEnVco0KxsKu443pGv0OqefyPC%3DsuvDQUjdqZTRsCphw%40mail.gmail.com?utm_medium=email&utm_source=footer>.
--
--
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 [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/b8e1d615-78db-4095-95af-6589dcf47f4f%40raelity.com.
