Skip to main content

Questions tagged [vimdiff]

Filter by
Sorted by
Tagged with
0 votes
1 answer
42 views

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?
Sollosa's user avatar
  • 2,009
0 votes
2 answers
323 views

Is there a way/tool to show differences between two files side by side only highlighting differences in a similar way kdiff3 does that but with a tool that is reasonably fast?A similar question was ...
atapaka's user avatar
  • 675
0 votes
1 answer
48 views

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 ...
wile_e8's user avatar
  • 111
0 votes
2 answers
1k views

I've never worried about vimdiff on my own computer, where I have archlinux installed, so everything is up-to-date, generally speaking; I generally just used it, and I'm fine with it. After all, :...
Enlico's user avatar
  • 2,362
3 votes
2 answers
4k views

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 ...
n0542344's user avatar
  • 446
23 votes
4 answers
84k views

Saying that I have two files: a.txt and b.txt. The content of a.txt: hello world The content of b.txt: hello world something else Of course I can use vimdiff to check their difference, I can make ...
Yves's user avatar
  • 3,411
1 vote
1 answer
987 views

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 ...
Imperishable Night's user avatar
1 vote
1 answer
805 views

I am comparing a list of packages for a Django project in production and development. There are inconsistency in versions, but I am only concerned about the packages that got installed independently ...
Forethinker's user avatar
  • 1,429
0 votes
4 answers
1k views

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 ...
Sandosh Kumar P's user avatar
13 votes
1 answer
20k views

Is there a way we can exclude the lines which are same in the below output? I did a vim -d file1 file2 but its showing the differences and also some additions lines before and after the differences. ...
Sandosh Kumar P's user avatar
2 votes
1 answer
337 views

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 ...
Sandosh Kumar P's user avatar
1 vote
1 answer
575 views

I am comparing 2 files in a script and exporting to html file (Below is the syntax i am using). When the file get saved, its saving in a name called Diff.html by default. Is there a way we can save it ...
Sandosh Kumar P's user avatar
2 votes
1 answer
2k views

(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 ...
user1902689's user avatar
  • 1,228
4 votes
1 answer
469 views

I added few vim plugins like sytastic, nerdTree. They change the status line and other UI elements, which works fine while editing files. But when I invoke vimdiff on 2 files, the nerdTree pane also ...
mtk's user avatar
  • 28.6k
10 votes
3 answers
2k views

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 ...
Valentas's user avatar
  • 369
21 votes
2 answers
11k views

I am trying to compare two command output (no files) vimdiff "$(tail /tmp/cachain.pem)" "$(tail /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem)" I tried playing with redirection, pipe, and vim - -...
Florian Bidabé's user avatar
5 votes
4 answers
3k views

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 ...
Big McLargeHuge's user avatar
2 votes
1 answer
591 views

In my daily work, I only deal with unified diffs, so I would like to define the alias alias diff='diff -puN' in my .zshrc. This alias is not respected when I use the shell from the vim command line ...
Simon K.'s user avatar
1 vote
2 answers
1k views

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, ...
Sparhawk's user avatar
  • 20.6k
13 votes
2 answers
6k views

Is there a convenient way to identify duplicate or near duplicate blocks of text within a file? I want to use this for identifying code duplication. It looks like there are specialty programs with ...
Praxeolitic's user avatar
  • 1,698
10 votes
4 answers
4k views

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 ...
Shum's user avatar
  • 1,375
5 votes
1 answer
2k views

Moved lines are frequently annotated as deletes and adds but they can be shown as moved-from and moved-to instead. Like in this screenshot of Notepad++.
1.61803's user avatar
  • 1,301
27 votes
6 answers
27k views

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 ...
mtk's user avatar
  • 28.6k