All Questions
10 questions
0
votes
2
answers
276
views
Fast file comparison that displays results side by side with structure understanding (a la total commander in windows)
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 ...
- 675
0
votes
1
answer
39
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
2
votes
2
answers
3k
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 ...
- 416
23
votes
4
answers
83k
views
How to write the difference between two files into a file
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 ...
- 3,401
1
vote
1
answer
788
views
How to get the unmatched lines in vimdiff
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 ...
- 1,429
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
2
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 ...
- 359
2
votes
1
answer
587
views
Vim and unified diffs
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 ...
- 23
13
votes
2
answers
6k
views
Identify duplicate blocks of text within a file
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 ...
- 1,688
5
votes
1
answer
2k
views
How can I see moved lines in a file comparison with vimdiff / diff?
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,291