On Saturday 14 February 2009 7:10 pm, Markus Heidelberg wrote:
[...]
> > ~/.build/vim/experimental/vim_extended $ git checkout custom
> > fatal: you need to resolve your current index first
>
> Remember git-mergetool from the README?
yes, i do now, and that reminds me it barked at me the last
time i ran it too -- this time it's barking louder:
~/.build/vim/experimental/vim_extended $ git mergetool
git config option merge.tool set to unknown tool: gvimdiff
Resetting to default...
Merging the files: src/normal.c
Normal merge conflict for 'src/normal.c':
{local}: modified
{remote}: modified
Hit return to start merge resolution tool (kdiff3):
and yes, gvimdiff is in my path:
~ $ which gvimdiff
/usr/local/bin/gvimdiff
i've got to say, though, kdiff3 looks like a very competent
tool, and it only took a minute to figure out how to tell it
which of the three modules had the code i wanted
if i had to guess i'd say gvimdiff support was added in a
newer git version than mine -- yet another vote for
upgrading
thx again markus,
sc
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
