Questions tagged [vimdiff]

The diff feature of vim lets show differences between two, three or four versions of the same file

12 questions with no upvoted or accepted answers
Filter by
Sorted by
Tagged with
4
votes
0answers
58 views

VIMDIFF missing small differences

I have two nearly identical very large files (890,000+ rows of exactly 899 characters each fixed length file). On rows 289141-289148 one file has a pipe character in column 38, and the other file has ...
3
votes
0answers
63 views

The way to imrove vimdiff similarity-searching mechanism

I'm trying to understand how vimdiff work. Here I tried to diff two simple files. The 1st: abcdefghijklmnopqrstuvwxyz foo abcdefghijklmnopqrstuvwxyz iii bar The 2nd: abcdefghijklmnopqrstuvwxyz ...
2
votes
0answers
43 views

Vimdiff : highlight line numbers differently

I use relative line numbers thanx to the following settings in my vimrc: set number set relativenumber Since I don't want to wrap lines in diff mode, it's sometimes hard to tell which line include a ...
2
votes
0answers
27 views

Lock the first line when doing diff between two files in vimdiff

I am trying to do a diff between a couple of csv files. I have performed column -t -s"," on both the files to be able to compare better. The first row contains the column names and I want to lock it ...
2
votes
0answers
58 views

Is there a better way to diff from a patch?

Background: I'm working on a large project that has some disparate coding styles. I'm working on unifying that but only the parts that I've most recently touched. The tool that I'm using produces a ...
2
votes
0answers
61 views

“diff”-ing current with “earlier” time

I have a file opened and I know I can do :diffsplit to open the file in a diff view. I also know that I can do something like :earlier 30m to see how the file was 30 minutes ago. My question is: how ...
2
votes
0answers
277 views

How to execute a function when a diff closes

I have a setting (namely highlight the 81st character on the line) that I would like to turn off when there is a diff. This is easy enough as a search through the autocmds results in: |FilterWritePre|...
2
votes
0answers
84 views

Mvimdiff launches with vertical split on far right

I'm trying to integrate mvimdiff into my workflow - but when I launch it via: git difftool <filename> I'm getting a wonky layout like this: _________________________ | | |...
1
vote
0answers
33 views

Is it possible to do a reverse vimdiff

There are many answers like this which talk about reversing the search results in one vimbuffer. But I am wondering if there is way to highlight matching lines only in vimdiff. Something like ...
1
vote
0answers
18 views

Is it possible to use Vim's power (Vim buffers…) while doing 3 way merge in Meld?

Is it possible to use Vim's power (Vim buffers...) while doing 3 way merge in Meld ? I can see in Meld you can change the default editor: edit -> Preferences -> Editor -> default editor I ...
0
votes
0answers
23 views

How do I disable conceal mode when doing diffsplit in Vim?

I would like the conceallevel be set to 0 whenever I do diffsplit, and set it to 2 when I get out of diff mode.
0
votes
0answers
94 views

make vim produce patch files without editing originals

I want to edit text files with vim, I would love vim file.txt To work like normal, and open file.txt in vim, like normal, and allow me to edit it seemingly like normal. The only difference is, all ...