Plugin linediff.vim : Perform an interactive diff on two blocks of text is similar to the one pointed ou by Vincent with some additional features: has a command to close the opened buffer seems to work without GUI insert some visual indication on the original file(s) being diffed. To use it you perform a visual … Read more
You could filter the two files through sed to eliminate the lines you don’t care about. The general pattern is /regex1/,/regex2/ d to delete anything between lines matching two regexes. For example: diff <(sed ‘/abXd/,/abYd/d’ file1) <(sed ‘/abXd/,/abYd/d’ file2)
You can use rsync with the -n flag to find out if the files are in sync, without actually doing a sync. For example, from server1: rsync -n -avrc /abc/home/sample1/* server2:/abc/home/sample2/ This will print the names of all files (recursive, with the -r flag) that differ between server1:/abc/home/sample1/ and server2:/abc/home/sample2/ rsync used parameters explanation -n, … Read more
I use the following: autocmd FilterWritePre * if &diff | setlocal wrap< | endif FilterWritePre is triggered immediately before a generated diff is written to the buffer, and setlocal wrap< copies the global value of wrap. Of course it’s also possible to simply force setlocal wrap.
Instead of using /usr/bin/vimdiff command, try this: $ vim file :vertical diffpatch path/to/diff (:vert diffpa for short.) This is equivalent to calling vimdiff on the original file and the subsequently patched file, but vim calls patch on a temporary file for you. Edit If you want vim‘s diff-mode to be entered automatically, use this: $ … Read more
Ctrl+w and right and left arrow can be used to move between any split windows on vim, not only vimdiff splits. These keys do work here on cygwin; also, Ctrl+w w also moves to the next window, but without the delay you mentioned. It is possible that you have mapped these keys in your .vimrc … Read more
Vim can export to HTML, see: :help :TOhtml
You mean conflict markers such as <<<<<<<, =======, and >>>>>>> on merges to indicate that the automatic resolution failed?! You can use my ConflictMotions plugin for that; it provides ]x and [x mappings, ]= for navigation within a conflict, and even corresponding text objects ax and a=.
Diff between current file and the index :Gdiff :0 Diff between current file and some other [revision] :Gdiff [revision] Diff between current file and current file 3 commits ago: :Gdiff ~3
: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 ones, and then quit.