Good afternoon all, I am having some issues with hg performing an update, it wants to use vimdiff and this is not the way I like to work. According to the mercurial simply placing the folloing in the ~/.hgrc should make mercurial change back to leaving the >>>> <<<<< marks when it cannot resolve something. Whatever I specify it still runs vimdiff. [ui] ui.merge = internal:merge any suggestions would be greatly received. Thanks Michael. PS, a little more info on the version of HG I am using. galaxy@jic55666:~/software/galaxy-central$ hg --version Mercurial Distributed SCM (version 1.6.4) ----------------------------------------------------------------------------------------------------- Please note, that my email address is no longer givenname.surname@bbsrc.ac.uk. Please update your records to reflect my new email address of givenname.surname@nbi.ac.uk as shown on this email.
michael burrell (TOC) wrote:
Good afternoon all,
I am having some issues with hg performing an update, it wants to use vimdiff and this is not the way I like to work. According to the mercurial simply placing the folloing in the ~/.hgrc should make mercurial change back to leaving the >>>> <<<<< marks when it cannot resolve something. Whatever I specify it still runs vimdiff.
[ui] ui.merge = internal:merge
That worked for me for a while and then it started going back to vimdiff again. Very annoying. I'll eventually figure out what's wrong but if anyone else knows, I would also appreciate the answer. --nate
any suggestions would be greatly received.
Thanks
Michael.
PS, a little more info on the version of HG I am using.
galaxy@jic55666:~/software/galaxy-central$ hg --version Mercurial Distributed SCM (version 1.6.4) ----------------------------------------------------------------------------------------------------- Please note, that my email address is no longer givenname.surname@bbsrc.ac.uk. Please update your records to reflect my new email address of givenname.surname@nbi.ac.uk as shown on this email.
___________________________________________________________ Please keep all replies on the list by using "reply all" in your mail client. To manage your subscriptions to this and other Galaxy lists, please use the interface at:
Nate Coraor wrote:
michael burrell (TOC) wrote:
Good afternoon all,
I am having some issues with hg performing an update, it wants to use vimdiff and this is not the way I like to work. According to the mercurial simply placing the folloing in the ~/.hgrc should make mercurial change back to leaving the >>>> <<<<< marks when it cannot resolve something. Whatever I specify it still runs vimdiff.
[ui] ui.merge = internal:merge
That worked for me for a while and then it started going back to vimdiff again. Very annoying. I'll eventually figure out what's wrong but if anyone else knows, I would also appreciate the answer.
Okay, turns out the problem here, at least in my case, was that it should be: [ui] merge = internal:merge Without the 'ui.' preceding 'merge'. I have no idea how this ever worked, perhaps through some bug in Mercurial? Interesting that we both had the same thing. --nate
--nate
any suggestions would be greatly received.
Thanks
Michael.
PS, a little more info on the version of HG I am using.
galaxy@jic55666:~/software/galaxy-central$ hg --version Mercurial Distributed SCM (version 1.6.4) ----------------------------------------------------------------------------------------------------- Please note, that my email address is no longer givenname.surname@bbsrc.ac.uk. Please update your records to reflect my new email address of givenname.surname@nbi.ac.uk as shown on this email.
___________________________________________________________ Please keep all replies on the list by using "reply all" in your mail client. To manage your subscriptions to this and other Galaxy lists, please use the interface at:
___________________________________________________________ Please keep all replies on the list by using "reply all" in your mail client. To manage your subscriptions to this and other Galaxy lists, please use the interface at:
participants (2)
-
michael burrell (TOC) -
Nate Coraor