Git difftool and mergetool

dugan · 12-03-2016, 03:32 PM

What do you use for your git difftool and mergetool?

For the difftool, I was using icdiff but would like to switch to somehting more graphical now.

For the mergetool, I don't have an opinion because I learned about that setting yesterday.

firstfire · 12-04-2016, 12:24 AM

I am trying vim-fugitive now. Give it a try if you use vim.

dugan · 12-04-2016, 12:33 AM

Quote:

Originally Posted by firstfire

I am trying vim-fugitive now. Give it a try if you use vim.

Oh, I use it. It's great.