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

gvimdiff: How to keep width for both windows at 50% when maximizing?

When I start gvimdiff, the two windows occupy 50% of the window width. Exactly what I want. However, when I then maximize the gvimdiff window via the window manager, the width of the left window stays as is and all the extra width is allocated to…
Jens
  • 69,818
  • 15
  • 125
  • 179
0
votes
2 answers

Is there a way to view two diffs in one vim tab?

I know that the diffs in vim are local to page, this means we can only have one diff in one tab page, right? But what if I want to have two diffs in one tab page. Eg, one diff is between the top two windows, and the other diff is between the bottom…
weynhamz
  • 1,968
  • 18
  • 18
-1
votes
0 answers

How can i show the vimdiff diffs to the top of table

i am using vimdiff for comparsion a long list of lines. as i am generating a html page out of it ,i think best way to move the line to top is before doing diff it self . but is there any easy way of doing this either on result or during d vimdiff -c…
Jsmith
  • 1
  • 1
-1
votes
3 answers

find identical keys with different values from two text files

I have two files which have data in a format like this: cat File1.txt A: 1 B: 2 C: 3 D: 4 E: 5 cat File2.txt A: 10 B: 2 C: 30 D: 4 F: 6 I was wondering how I could print the diff for common keys like: A: 1, 10 C: 3, 30
user2517676
  • 969
  • 6
  • 15
  • 25
-1
votes
2 answers

How to execute vimdiff command from inside a java program

I have a list of files for which I have to run the vimdiff command and save the output as a html file.I am doing this with Java. Below is the command I am trying to execute String cmd = "vimdiff -c 'set foldlevel=9999'…
Kishore Mohanavelu
  • 439
  • 1
  • 6
  • 17
-1
votes
2 answers

Git Flow Feature Creation and Rebasing Features

I have 2 branches, development and master. I want to create a new feature on the development branch so I do: git flow feature start test_01 Which creates a feature branch and switches to this branch. For testing reasons I switch to the development…
FastSolutions
  • 1,809
  • 1
  • 25
  • 49
-2
votes
1 answer

launching vimdiff from diff output

I am trying to diff two folders using diff and launch vimdiff for each difference from a shell script This is how I extracted filenames and made complete command using awk which I like to execute $ diff -Bbqr oldfolder newfolder | grep differ | awk…
Jim
  • 338
  • 1
  • 14
1 2 3
…
13
14