On 16 January 2016, LCD 47 <[email protected]> wrote:
[...]
> "git pull" will then merge changes to upstream master to your
> branch, keeping your changes:
>
> git pull
[...]
Adding "--no-edit" should help too:
git pull --no-edit
/lcd
--
--
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].
For more options, visit https://groups.google.com/d/optout.