What's the difference between vimdiff and vimdiff2 in git?
vimdiff2 was introduced in commit 0008669 (Sept 2010, for git 1.7.4) It is like vimdiff, but with different merge options (as commented in commit b2a6b71, git 1.8.2: "vimdiff and vimdiff2 differ only by their merge command"). It (vimdiff2) forces a 2-way merge, versus vimdiff which will use a 3-way merge...
vim: disable plugin by default (diffchar)
Just put this into your ~/.vimrc: let g:DiffExpr = 0 You then have to explicitly enable the plugin via one of its mappings or commands....
While loop breaks in bash script if i call Vimdiff within loop
Redirect so that vimdiff doesn't eat the input intended for the loop: while read line do vimdiff -c TOhtml -c wqa! $line"_file1" $line"_file2" < /dev/null done < inpFile.txt ...
How to quit/exit all windows/buffers/splits/tabs at once in vim or vimdiff? [duplicate]
:qa quits all open windows/buffers/splits/tabs (aliases: :qall :quitall) Vim documentation for :qa For help on this command in vim: :help :qa :qa! will quit without giving an option to save if it's modified. :wqa will write all changed buffers and then quit. :wqa! will write all changed buffers, even readonly...
Why does git difftool use git diff instead?
git config --global diff.tool meld This will set the default difftool to meld. I.e. when you invoke git difftool without the --tool parameter, git will run meld. You can also remove that part of your config, git won't read difftool.tool as it's not one of git's known config options: [difftool]...
How to use gvim color scheme with vimdiff output
The :TOhtml command uses the $VIMRUNTIME/syntax/2html.vim script to convert the buffer's colors into HTML. That one uses a has("gui_running") condition for the GUI colors, and else falls back to hard-coded terminal colors. So even with recent patches to support 24-bit colors in (certain) terminals, you won't get the GUI colors...
vimdiff: force line-by-line comparison (ignore supposedly missing/additional lines)
How about using diffchar.vim plugin? It compares line-by-line in non-diff mode. Please open 2 files on 2 windows and then just press F7. By default, it tries to find the differences by characters in a line, but you can change the difference units, words or something.