Tagged Questions

The tag has no wiki summary.

learn more… | top users | synonyms

0
votes
0answers
137 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 ...
12
votes
1answer
3k views

Can't run Vimdiff (7.4) on Windows 7

I recently installed the 7.4 version of gVim on a Win 7 machine. Trying to diff two files from the context-sensitive menu on Windows Explorer, I keep getting the error messages: E810: Cannot read or ...
2
votes
1answer
600 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 ...
1
vote
0answers
217 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
1answer
527 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?
0
votes
1answer
265 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 ...
2
votes
1answer
189 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 ...
5
votes
2answers
1k 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 ...
0
votes
2answers
887 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 ...
1
vote
1answer
207 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 ...
4
votes
2answers
2k 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 ...
0
votes
2answers
432 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 ...
7
votes
2answers
3k 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. (Open the image on a separate ...
0
votes
1answer
184 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? ...
1
vote
1answer
527 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? ...
2
votes
1answer
92 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 ...
15
votes
3answers
6k 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 ...
4
votes
3answers
3k 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 ...
17
votes
4answers
11k 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 ...