Questions tagged [vimdiff]
The vimdiff tag has no summary.
23 questions
0
votes
1
answer
41
views
is vimdiff able to swap delta between open files?
hence vimdiff a file comparsion tool targeted towards the cli environment.
I'm wondering if it offers functionality to swap line of codes between two tabs?
- 2,009
0
votes
1
answer
48
views
Is it possible to make diff suggestions in vimdiff?
I'm comparing two files in vimdiff. For one section of the code in the first file, the same section in the second file has several lines of code added, and then a slightly modified copy of the section ...
- 111
3
votes
2
answers
4k
views
Display git-diff between master and my last commit
I use git on a regular basis for collaboration with other people. When we work together on a shared repository, I'd like to be able to view the changes performed by others which happened between my ...
- 446
1
vote
1
answer
986
views
vimdiff: show only difference between "base" and "remote"
I'm merging two branches in a project, which both changed the same part of some files in different ways. The "remote" branch is somewhat closer to the common ancestor ("base"), so I want to only show ...
0
votes
4
answers
1k
views
vimdiff - Weird Issue comparing 2 files
When I compare the below 2 files its comparing it wrongly. How to compare? All the rows are available in the file2 but its not working. When I do a "vim -d a b" its showing like the values are missing ...
- 347
2
votes
1
answer
335
views
Display headers using vimdiff or vim -d
I have 2 tables which I need to compare and display the differences. I am able to do that using the following command:
vim -d table1 table2 -c :TOhtml -c :wqa
The problem I am facing is it's ...
- 347
2
votes
1
answer
2k
views
diff - showing changed lines in different section than inserted lines
(I'm running into this in a context of using vimdiff, which relies on and interprets the output of diff, so I think this is a diff question.)
Given these files, the first having 2 lines, the second ...
- 1,228
10
votes
3
answers
2k
views
diff characterwise
Is there a stable tool (option/plugin of an existing tool: vimdiff, diff, etc) in Linux to do diff between two text files characterwise?
I would like to see the longest common subsequence between my ...
- 369
5
votes
4
answers
3k
views
Comparing files with vimdiff from a script
I'm writing a script to compare two directories recursively and run vimdiff when it finds a difference:
#!/bin/bash
dir1=${1%/}
dir2=${2%/}
find "$dir1/" -type f -not -path "$dir1/.git/*" | while ...
- 3,306
1
vote
2
answers
1k
views
Is there a sudoedit equivalent for vimdiff?
I'm trying to get into the habit of editing root-owned files with sudoedit, instead of sudo vim. This has a few advantages, one of which is that it uses my user's ~/.vimrc.
Is there an equivalent, ...
- 20.6k
10
votes
4
answers
4k
views
Make vimdiff display different lines as different lines (not partially different)
vimdiff has an annoying habit of displaying two almost-completely-different lines as the same partially-different line just because they share a character in common at the beginning or end.
For ...
- 1,375
27
votes
6
answers
27k
views
vimdiff disable/enable color coding
Is there any way to quickly disable/enable color coding in vimdiff ? The problem is, I have colored text in vim and the text is invisible is the text-color is Red, and the vimdiff too tries to put a ...
- 28.6k