On 06/07/13 20:22, tux- wrote:
Tony Mechelynck schrob am Samstag, 6. Juli 2013 um 20:21 Zeit:

"hg fetch --switch-parent" merges them every time I pull
new changes

Hmm..

"hg: unknown command 'fetch'" :-/


It's a built-in extension to Mercurial, you have to enable it before you can use it. It does a pull-update or a pull-and-merge (depending of the structure of your clone) in one operation. See http://vim.wikia.com/wiki/Getting_the_Vim_source_with_Mercurial for details.


Best regards,
Tony.
--
ARTHUR:    ... and I am your king ....
OLD WOMAN: Ooooh!  I didn't know we had a king.  I thought we were an
           autonomous collective ...
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

--
--
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/groups/opt_out.


Raspunde prin e-mail lui