I've been loving vimdiff as my git difftool for a while.
Vimdiff and Matlab packages
Vimdiff runs into some problems when working with Matlab code. Matlab considers
directories with names beginning with
+ as "packages", a natural way to organize
projects. However, this means that many paths relative to the git …