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
0
votes
1 answer

How can I undo editing an indexed file in Git?

This looks strange but I don't understand what happened. I was checking the gitdiff using vimdiff (using vim-fugitive). Then, while being in the indexed buffer, I presed dp which should put the changes in the indexed version into the working…
Salahuddin
  • 1,617
  • 3
  • 23
  • 37
0
votes
0 answers

How to change Output File FG/BG Color generated from Bash Script (vimdiff)

I am differentiating two CSV files and generating its output in one html file by using below query: vimdiff Sheet1.csv Sheet2.csv -c TOhtml -c 'w! CsvResult.html' -c 'qa!' In above cmd two csv files (sheet1 and sheet2) in my Windows desktop, and…
Satish Shihani
  • 469
  • 3
  • 17
0
votes
1 answer

Activating alternate Diff mode via a function call in Vim/gVim

In a recent question, I asked how to make vimdiff ignore the extra spaces when comparing. Following the answer and some further reading, I tried to do the following: .1. Locate _vimrc and find the MyDiff() function definition. It contains the line: …
ysap
  • 7,723
  • 7
  • 59
  • 122
0
votes
2 answers

Why is VimDiff so limited?

With all the advanced editing capabilities of Vim, I find it hard to believe that VimDiff doesn't have a way of copying from/to right/left!! What else can a difftool be used for? Any idea? What are the capabilities of VimDiff? Also, I don't even see…
Rafid
  • 18,991
  • 23
  • 72
  • 108
0
votes
0 answers

Vimdiff: Highlight current change in all buffers

I'm using Tim Pope's vim-fugitive plugin to integrate git features into Vim. When I run Gdiff on a conflicted file, it fires up vimdiff to resolve the conflict. The diff tool is great but I find it really hard to know at a glance which changes on…
sdeleon28
  • 329
  • 1
  • 11
0
votes
1 answer

git diff with matlab package directory

I'm having issue running git dff with +Dir01/file.m. I think the problem is with the + in the directory name. How can I get git diff to work with this? Thank you in advance.
kirikoumath
  • 723
  • 9
  • 20
0
votes
1 answer

Vim error: cannot create diffs. Vim folder has no diff.exe

When trying to use vim diff to compare two files on windows 7, I get an error message: cannot create diff. My vim version is 7.4.965. Searching for this on the internet, it seems that C:/Program Files/Vim/vim74 should normally contain a diff.exe: it…
chtenb
  • 14,924
  • 14
  • 78
  • 116
0
votes
1 answer

Opening file present in another folder which has same relative path as current opened file in vim using vertical diffsplit?

Say I have following 2 similar files in 2 different workspace on same linux machine. /user1/ws1/ip/src/ip_main.c /user1/ws2/ip/src/ip_main.c Now I did, cd user1/ws1/ vim ip/src/ip_main.c then I press ESC then executed :cd ../ws2 which shows…
ypp
  • 141
  • 10
0
votes
1 answer

How do I reference "the left" and "the right" buffer in a vimdiff?

Disclaimer: I know now to use vimdiff, dp, dg and the other commands related to diffing in Vim. However, there's something which seems like it cannot be done. I want to remap the cursor keys so that → moves the difference to the right and ← moves…
eckes
  • 64,417
  • 29
  • 168
  • 201
0
votes
1 answer

svn diff calling a csh script calling .cshrc despite csh -f flag

Got myself a standard script for passing svn diff output to vimdiff, on my RHEL box: #!/bin/csh -f vimdiff ${6} ${7} added it to the path, and set diff-cmd in ~/.subversion/config This works great, and I have all the diff-y goodness I…
SamBob
  • 849
  • 6
  • 17
0
votes
1 answer

md5_file outputs different values for files with same contents

I've got a php test that generates an output file and compares it with a sample one previuosly generated. I make the comparison by using the php function "md5_file" with both files. My problem is that even though both files have the exact same…
marcelo
  • 23
  • 3
0
votes
2 answers

`vimdiff` not compatible with autocmd?

I was used to use vimdiff and loading the compared files. Now, on vimdiff execution, it happens: "a" [readonly] 5454L, 269796C "b" [readonly] 241L, 10170C Press ENTER or type command to continue The only configuration change is the introduction of…
1737973
  • 159
  • 18
  • 42
0
votes
1 answer

vim diff does not work

Somehow my vim (macvim) stops showing me the highlighted differences betweeen two files. My env: osx 10.9 with macvim installed Facts: The diff works a few months ago when I do either of below: vimdiff a b, or vim -d a b It shows the color…
stephen cheng
  • 99
  • 8
0
votes
1 answer

After upgrading my Mac to 10.9.2, vim as merging tool broken

I've upgraded my Mac to 10.9.2, and suddenly found that the vim would complain that the --merge option is unknown. But I haven't change my ~/.gitconfig, where the options exist and always works find until now. Does this mean I need to upgrade or…
snowmantw
  • 1,611
  • 1
  • 13
  • 25
0
votes
3 answers

How to become more productive in git

I am starting git and I am looking into being more productive. My experience was in Clearcase (mainly Windows version). I am looking for good patterns to increase productivity. To give an example I configured vimdiff as a difftool that helps me see…
Cratylus
  • 52,998
  • 69
  • 209
  • 339
1 2 3
…
13
14