Stack Overflow
Stack Overflow

Questions tagged [vimdiff]

vimdiff is a vim mode that can show differences between two, three or four files.

vimdiff is the same as vim -d or using :diffthis on several windows in the same vim tab.

Use dp to propagate a difference and do to get it, ]c and [c to navigate between differences.

202 questions
1
vote
1 answer

How to use gvim color scheme with vimdiff output

I am running gvim -d in a batch file and generating HTML output using TOhtml. I would like to use the console version of vimdiff to get a slight performance increase but it insists on using the 256 bit console color scheme. Is there any way to tell…
Chris
  • 55
  • 8
1
vote
1 answer

Vimdiff strangeness

I have strange problems with vimdiff, everytime I do something like this: git difftool HEAD~2 -- src/some-file.hs first of all - it opens two separate windows, one - with the diff and the second - with the file by itself. Why and how do I fix…
iLemming
  • 34,477
  • 60
  • 195
  • 309
1
vote
1 answer

While loop breaks in bash script if i call Vimdiff within loop

I am trying to use vimdiff of two files within while loop. But it breaks after 1st loop. while read line do vimdiff -c TOhtml -c wqa! $line"_file1" $line"_file2" done < inpFile.txt Though inpFile contains multiple entries, the above loop breaks…
user3665224
  • 1,349
  • 3
  • 16
  • 34
1
vote
0 answers

How to get hg vdiff to follow renamed/moved files?

I use vimdiff as the diff tool in Mercurial. When I diff a renamed or moved file, it treats the file as new instead of comparing it with the old one. Is there a way to fix that? Here's my .hgrc: [extensions] hgext.extdiff = [extdiff] cmd.vimdiff…
Saulo Silva
  • 1,219
  • 1
  • 20
  • 37
1
vote
1 answer

git whatchanged with vimdiff

I would like to see the changes I am pushing with vimdiff. I can see the changes before commit with $ git diff configuring vimdiff to ~/.gitconfig. After commits, I can see the commits with --patch switch on whatchanged command, $ git whatchanged…
prayagupa
  • 30,204
  • 14
  • 155
  • 192
1
vote
2 answers

how to redirect only the difference between two files using vimdiff

vimdiff file1 file2 file2 content which is not present in file1 has to be written in new file, file3. Is there any options for vimdiff to get this difference.
user2380503
  • 21
  • 2
  • 3
1
vote
1 answer

vimdiff: hop between 'blue' lines(lines with no corresponding text in file to compare)

I have to compare two (assembly) files and see where the instructions do not match. In the vimdiff I use there are two colors to mark the difference in text. 1. blue: when there is no text in the other file to compare. 2. pink: when both files have…
A. K.
  • 34,395
  • 15
  • 52
  • 89
1
vote
2 answers

How to get vimdiff to display output from cvs diff --side-by-side

CVS diff has the option to display revisions side by side and denote diffs with usual patch symbols like: import zlib import zlib > import time import traceback …
Samer Atiani
  • 695
  • 1
  • 6
  • 8
1
vote
3 answers

To vimdiff changed files at Dropbox by Vim

I often get a notification to my Vim that my file has been changed elsewhere, since I use Dropbox. I then need to press L because it is my only way to get to see the file changed by my friend. This forces me to use his version and then just try…
Léo Léopold Hertz 준영
  • 134,464
  • 179
  • 445
  • 697
1
vote
1 answer

Git is not working with vimdiff

I am using meld with git for merging and I want to try vimdiff. Configured three way merge with git and then my own diff command: [merge] tool = vimdiff3 conflictstyle = diff3 [mergetool "vimdiff3"] cmd = gvim -f -d \"$LOCAL\" \"$BASE\"…
lzap
  • 16,417
  • 12
  • 71
  • 108
0
votes
1 answer

vimdiff style color question: top & bottom lines

I cannot find what the highlight name (or highlight group) is to change the guifg and guibg colors of the top and bottom lines in vimdiff. (The bottom line above the statusline, that is). (More specifically, the lines with the "+--" at their left…
Melvin Q. Watchpocket
  • 103
  • 4
0
votes
0 answers

How to select all the matched files using vimdiff so that non matching files are deled

I have a ligand folder lig1 containing about 2000 files in .pdbqt format…
Dharmaraj Paudel
  • 1
  • 2
0
votes
2 answers

git diff - git difftool - vimdiff - How to compare two files from column 1 to 72 - It's possible config one of this tools

For mainframe modernization I'm using git to modify my Cobol programs. To compare two programs one in Dev stage and another in Prod stage, I would like to compare them only from column 1 to 72. I tried using git diff, git difftool and vimdiff but I…
RedGoldPhoenix
  • 49
  • 4
0
votes
2 answers

merge two files with nvim -d or vimdiff

Yesterday the arch community announced the successful migration to git. Congrats at this point. Reading the news article and the steps to use the new repositories I stumbled over the lines "merge the pacman pacnew /etc/pacman.conf.pacnew file". I…
MaKaNu
  • 762
  • 8
  • 25
0
votes
0 answers

vimdiff: Move cursor into a block of deleted lines

When I open two files using vimdiff side by side I cannot put the cursor into a block of deleted lines. vimdiff instead jumps over them. How can I configure vimdiff such that diffs are still side by side with the matching lines next to each other…
Steven Thiel
  • 153
  • 4
1 2 3
…
13 14