Questions tagged [vimdiff]
The vimdiff tag has no usage guidance.
22
questions
56
votes
4
answers
43k
views
vimdiff: Jump to next difference inside line?
vimdiff is very handy for comparing files. However, I often use it on files with long lines and relatively few differences inside the lines.
vimdiff will correctly highlight differences inside a line ...
51
votes
3
answers
34k
views
Make vimdiff show entire file
How can you have vimdiff show the entire contents of the files being differenced? I'd like the color highlights of the differences, but would still like to see the entire files, i.e. the parts that ...
35
votes
3
answers
19k
views
How do I only dp or do just the lines, not the entire block in Vim diff?
I'm currently using MacVim (Snapshot 64) "Split Diff by..." menu option.
The file is Django's my settings.py from version 1.3.1 to a fresh file from version 1.4.
I know two basic commands
do to "...
30
votes
1
answer
17k
views
Can't run Vimdiff (7.4) on Windows 7
I recently installed the 7.4 version of gVim on a Windows 7 machine. Trying to diff two files from the context-sensitive menu on Windows Explorer, I keep getting the error messages:
E810: Cannot ...
17
votes
3
answers
12k
views
vim: diff two sections in two files, but not the entire file?
I upgraded a system from Nagios 2 to Nagios 3, and now I am comparing some differences in the old and new configuration files.
There are significant changes to the configuration files, and I do not ...
8
votes
5
answers
4k
views
Vimdiff and git all at once
I use vimdiff as my difftool with git.
Let's say that I've changed twelve files. The problem is that sometimes I run git diff and around the fourth or fifth file I see something that I want to edit/...
6
votes
1
answer
4k
views
Git fails to launch Vim in Cygwin
I have Git working with Vim in a Powershell environment on my work laptop (Windows 7). It pops up Vim when I commit or use my git vimdiff alias.
I have attempted the same setup under Cygwin (being a ...
5
votes
3
answers
5k
views
Change color scheme when calling vimdiff inside Vim
I'm using the VCSCommand plugin.
I'm calling VimDiff utility inside Vim by calling :VCSVimDiff.
I have in my vimrc:
if &diff
set t_Co=256
set background=dark
colorscheme peaksea
...
5
votes
3
answers
3k
views
Various methods of trying to set up a git diff tool lead to "fatal: cannot exec [...] : Bad address"
I'm on Linux Mint 17 64-bit. Just purged git and re-installed with apt. Deleted ~/.gitconfig. Only configuration I do after supposedly fresh install is (while inside a repo)
git config diff.tool ...
4
votes
2
answers
2k
views
Is there a quick way to horizontally scroll in VimDiff with word-wrap?
VimDiff seems to be a useful tool, but I can't seem to find a way of quickly and efficiently scrolling horizontally when word-wrap is set to "off". I am currently using "zh" and "zl" but they only ...
3
votes
1
answer
262
views
Diff bar appears on normal editing mode after running vimdiff
Even after closing all instances of vim and vimdiff, when I open two files on a split window (:vsp other_file), a bar appears at the left of the screen, where vimdiff shows diff locations.
How do I ...
2
votes
1
answer
2k
views
Key to close a fold in vimdiff?
Pressing spacebar on a + fold in vim in diff mode causes the fold to open.
What and where do I key if I want to close the fold again?
2
votes
1
answer
1k
views
Is there a way to vim diff only certain blocks in two files?
I use vimdiff as my preferred diff tool. I wonder if there is a way to vimdiff only certain blocks between two files (preferably without a plugin).
e.g. Comparing file1.py getValues() fn between line ...
2
votes
1
answer
930
views
Vimdiff functionality in Sublime Text 2
I wanted to know if it is possible to have a vimdiff like functionality to check for diff and have synchronized scrolling of two (or more) files in Sublime Text 2 just like vimdiff?
Thanks
1
vote
2
answers
2k
views
show differences between file and file in (compressed) tar archive
Say I have unpacked a gz-compressed tar file, and do not remember what changes I made to the unpacked files,
or I archived a folder a while ago and want to know what has changed to the files since.
I ...
1
vote
1
answer
439
views
how to disable loadview in vimdiff
I'm trying to disable the feature in vim that remembers where I was, when I'm using vimdiff. the reason for this is simple I don't want to miss a change that has scrolled out of view.
I found a lot ...
1
vote
1
answer
767
views
Using macvim diff for SVN diffs with Versions on OS X
I would like to use Macvim's diff mode for file comparison in the SVN application called "Versions" for OS X. How would I write a script that launches Macvim in diff mode for such file comparisons?
...
1
vote
0
answers
150
views
vimdiff show differences with only parent rows
Two config files contain many blocks of the form
block name {
.....
sub block name1 {
.........
sub block name2 {
....
}
}
.....
}
Example:
Input (LHS) :
ltm ...
1
vote
1
answer
761
views
Subversion + Vimdiff: how to abandon the diff process?
I have configured svn to open differences using the text (i.e. not graphical) version of vim. Whenever I'm satisfied viewing the changes of the current file I quit vim -- with :qa -- and the next file ...
0
votes
2
answers
3k
views
vimdiff in cygwin is not working properly
When I was comparing two files with vimdiff in my cygwin,
vimdiff a.c b.c
all lines were folded (as below)
Then I used zR to open all folders, but no difference was showed.
Another weird thing ...
0
votes
2
answers
404
views
Program/script to 'walk' through svn revision history
Looking for a program, or script, I can use to easily 'walk' through an SVN revision history for a specific file. Anyone know if this exists? Can I achieve this with the command line client for svn?
...
0
votes
0
answers
101
views
Making windows terminal color more like putty
How to make color in windows terminal same as putty which I am more use to, in the default color scheme in windows terminal many text are not clearly visible in utilities like vimdiff, I tried other ...