Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

I just set up git and set git mergetool to vimdiff and it works as expected.

If I set git config --global diff.tool vimdiff it behaves strangely:

git diff x y will open less and display the changes in normal linear output form

if I use git difftool x y it just prints the output into the console - again in linear diff form. ( The usual @@ -1,40 +1 @@ - + form)

I tried all the different tricks with external = vimdiff and tool = vimdiff etc. Nothing works. Any suggestions?

share|improve this question
    
Do you have core.pager set to anything? –  ephemient Apr 2 '12 at 21:00
    
➜ ~ git config --list merge.tool=vimdiff merge.conflictstyle=diff3 diff.tool=vimdiff –  mmlac Apr 2 '12 at 21:19

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Browse other questions tagged or ask your own question.