diff is a shell command to find differences between two files. It is common on all *nix based systems

learn more… | top users | synonyms

1
vote
3answers
2k views

Windows Explorer - Diff two files from the context menu?

Is there any way to diff two selected files from the context menu in Windows Explorer?
0
votes
2answers
21 views

How can I diff two files and get what is different in the second one as an output

What's easiest way to diff two files, check what is different in the second one and get it as output? I'm comparing two css files, and rest is the same only colors are different. PS: I also want to ...
1
vote
1answer
34 views

Git: show inline diff within context of full file

How can I view the full contents of a file, at a given revision, with 'inline' diffs; i.e. new lines prefixed with plus, lines that were removed prefixed with a minus, etc?
1
vote
1answer
25 views

How to send a delta (differential part) of a large binary file over the Internet?

I have sent a large (>1GB) binary file to a friend over a slow metered data plan and now I need to send the second version of the same file only slightly changed. I want to send only the delta/diff-ed ...
0
votes
0answers
9 views

Make git merge act on paragraphs/blocks instead of lines?

I am using git to manage a "configuration file" consisting of a number of blank-line-delimited configuration blocks of the standard sort like [one] alpha=1 beta=2 Most changes to this file consist ...
0
votes
1answer
17 views

git diff --no-index but with multiple files

I really like git diff's output format, and I use it a lot as git diff --no-index to compare arbitrary non-git-related files. But as far as I can tell when using --no-index you can provide only a ...
8
votes
1answer
9k views

Can I use an replace internal diff in Total Commander with an external diff program?

Since I don't really like Total Commander's internal diff 'Compare Contents' used in Compare by content and Synchronize Dirs -> Compare left & right I want to use something else like Winmerge or ...
0
votes
2answers
53 views

Merge two text files, with differences highlighted

I have two text files, which are almost the same except for some changes on a few lines. I would like to merge these two files into a single text file, with differences highlighted, so that I can then ...
0
votes
0answers
10 views

KDiff3-style *directory merge* tool for the Linux terminal?

I need a nongraphical tool (e.g. ncurses-based), that allows me to merge large directory structures. Ideally, something as nice as Beyond Compare. Or at least KDiff3. I know there was such a tool, ...
1
vote
2answers
3k views

Is there a tool to measure file difference percentage?

I am looking to compare two text files. Normally, I can just use diff to compare the two files to see the differences. This is great, except that I am more concerned with the percentage difference of ...
1
vote
0answers
10 views

Debian update: how to get more readable diff output?

I like working with apt-get on servers, but it's very cumbersome to go through the diffs of config files when upgrading a system to a new Debian version. Ideally it should be easy to hide changes in ...
1
vote
1answer
26 views

svn diff suddenly not showing anything, even though svn status shows modified files

I made some changes to a local, up-to-date repo, on CentOS 7, svn 1.7.14. Running svn diff shows the changes. Not sure if this has much to do with it, but a while later, I did an svn copy over to a ...
10
votes
2answers
4k views

WinMerge and Diffmerge

I prefer Winmerge to Diffmerge. But the one thing I envy is diffmerge's folder diff feature. Diffmerge shows, for complecate folders and subfolders, only different files(not folders). Winmerge shows ...
145
votes
10answers
205k views

How do I compare binary files in Linux?

I need to compare two binary files and get the output in the form <fileoffset-hex> <file1-byte-hex> <file2-byte-hex> for every different byte. So if file1.bin is 00 90 00 11 in binary ...
0
votes
1answer
55 views

How would I diff two mbox files in an intelligent way?

I have two mbox files containing about 6k emails each. They should be more or less identical, though #1 contains about 100 emails which #2 does not contain. I would love to generate a third mbox file ...
9
votes
4answers
8k views

Rsync print only files that would have been changed

Is there a way to get rsync to print the full filepaths to all files that are different without actually transferring any files? Alternatively, I need a way to diff the files across two trees (over ...
0
votes
2answers
43 views

How do I recursively diff two directores and ignore the first n lines of each file

This question is similar to How to diff only the first line of two files?, but recursively. I would like to diff two directories but: diff only the first N lines of each file in the two directories ...
1
vote
1answer
13 views

Looking for different tags in two XML files when the content is different

From time to time I translate some Android apps: the developer sends me an XML file, e.g. <string name="foo">Foo</string> <string name="baz">Baz</string> and I send him back ...
5
votes
4answers
9k views

Windows command line binary diff tools

Is there a Windows command-line diff tool that is free? I need to compare two binary files and see if they are different or not. I'm not interested in how they are different I just need to know if ...
7
votes
3answers
7k views

Binary diff/patch for large files on linux?

I've got two partition images (A and B) and want to use them to create a patch that I can apply on A on another computer in order to get the new B image without flooding the network. I have the ...
2
votes
0answers
1k views

Binary Visual Diff Tool for MacOS X

This might already be answered, but I did not find an answer that really matched my needs. I'm looking for a visual diff tool that can diff binary files. It was also OK if it was integrated into a ...
3
votes
1answer
416 views

Binary diff tool which would work the same way as diff(1) tool

Do you know Unix/Linux diff(1) tool works? It shows which lines were added and removed between 2 text files, and shows it in the human-readable form. I need the same kind of tool for binary files - ...
7
votes
1answer
6k views

How can I diff binary files in git?

I assume I need to set up a difftool. What difftools work? How do you put the parameters in?
0
votes
0answers
114 views

Three way binary comparison for savegame hacking

Basically, I'm trying to compare a bunch of savegames to find where some values are stored. First of all, it's a rogue-like interpreted in WinGlulxe. I'm dealing with almost 100% binary save files ...
1
vote
1answer
110 views

How to apply binary diff produced by fc to a file?

How can one apply diff file produced by fc /b command on Windows to update some file in a simplest way possible; i.e. without buying anything or downloading some large/questionable software? The diff ...
1
vote
1answer
935 views

Kdiff3 show conflict even that files have equal text and are binary equals

Like in title. Kdiff3 info dialogue shows that ( i do 2 way merge): Total number of conflicts: 0 Nr of automatically solved conflicts: 0 Nr of unsolved conflicts: 0 kdiff3 files a and b have equal ...
0
votes
1answer
39 views

BC3 - Folder Compare shows files as 'Binary different', though differences are unimportant?

I am trying to compare a folder with a zip file to see if there are any meaningful differences between the source files they contain. I have set my compare to ignore the folder structure for ...
36
votes
6answers
25k views

How can I diff two XML files?

On Linux, how could I generate a diff between two XML files? Ideally, I would like to be able configure it to some things strict, or loosen some things, like whitespace, or attribute order. I'll ...
5
votes
4answers
4k views

How to ignore moved lines in a diff

I am currently working on a source code generation tool. To make sure that my changes do no introduce any new bugs, a diff between the output of the program before and after my changes would ...
23
votes
4answers
7k views

How can I enable colored output for OSX diff?

I need to diff two files (not two versions of the same file, they are however tracked by git, but that is unrelated) and I would like some colored output, how can I achieve that? $ diff file_1 file_2 ...
5
votes
3answers
1k views

View incremental diffs of my revisions to files using Dropbox

Sometimes I use a simple editor like Notepad++ to edit my webpages on Dropbox. Notepad++, not being an über-editor or IDE, does not track file changes for me. But Dropbox does!! Has anybody ...
3
votes
2answers
124 views

is there a Diff tool for dropbox for Mac?

Is there a dropbox diff tool/app for Mac? So what I mean here in an app that highlights visually the difference between versions in a text file you have on dropbox. It would typically have two ...
0
votes
1answer
352 views

Alternative to diff with progress for massive directory compare?

I just rsync-ed 2,000,000 files (3TB) from one RAID to another. I want to make sure my data is intact. rsync -c takes a really long time. diff doesn't show me what it's doing. Is there an ...
0
votes
1answer
14 views

Why is my patch coming out in binary format?

I'm diffing two directories, 220 and sue, as follows: diff -r 220 sue > diff.txt The directory looks as follows afterwards: $ ls -al total 20 drwxrwx---+ 1 Administrators Domain Users 0 Jun ...
0
votes
1answer
36 views

Monitoring changes in file with bash

I'm running DHCP server on local network which calls this script every few seconds: dumpleases | awk '{print $2}' > leasesnow #get list of all IPs leased in a file, one per line ADDED=`awk ...
0
votes
2answers
364 views

diff ignoring eol and whitespace

I would like to diff two files, such that end of lines and white space be ignored. Namely, I would like diff to find no difference between d1.txt and d2.txt: $ cat d1.txt ...
11
votes
4answers
9k views

Prevent diff from checking for newline at end of file

I have two big trees, which I want to compare. Some of the files in the tree differ just because one has newline at the end, and the other file lacks this newline. I want to ignore this fact. I have ...
3
votes
0answers
72 views

How to show differences between two duplicity backups?

I want to be able to see the differences between two duplicity backups. I know there is the command verify but it only lists files which differ from the latest backup. If I try list-current-files with ...
5
votes
5answers
1k views

Difference in whitespace between 2 files on linux

I have 2 files that when I compare with diff show that every line has changed. When I compare them with diff -w (ignoring whitespace) it shows the few minimal changes that I expect. Obviously there ...
4
votes
7answers
2k views

Single line diff [closed]

Is there a diff tool I can run from the command line or maybe just an online webpage that will compare single lines? GitHub diffs do this, but I don't want to publish things to GitHub just to read the ...
6
votes
1answer
2k views

How to diff only the first line of two files?

I want to diff only the first line of two files, as opposed to the entire file. How would I do that? I only need a solution for the the first line, but if you could specify the number of lines that ...
0
votes
2answers
677 views

Why does my busybox diff report 'Common subdirectories' for every file pair?

I am using this version of diff on my Synology NAS to verify a backup: xyz> diff BusyBox v1.16.1 (2014-05-29 11:26:15 CST) multi-call binary. Usage: diff [-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U ...
3
votes
1answer
333 views

file changes — notification and diff

I'm looking for a way to be notified if a text file changes (Windows 7), and be offered a file diff upon such a change. For example, the text editor Notepad++ does part of this, notifying me of an ...
1
vote
1answer
74 views

How can I quickly compare two directories skipping hard linked files that exist in both directories in linux

I have two directories that I would like to compare. The first directory contains an rsync backup of many thousands of folders and files. The second directory contains hard links to all of the files ...
1
vote
0answers
8 views

Is there a diff-buffer-with-file equivalent for Word?

Hitherto I've done all my work in Emacs and have become accustomed to diff-buffer-with-file, which shows changes that are made in the buffer but have not yet been saved. Is there a similar tool within ...
2
votes
2answers
2k views

Remove difference b/w PC and Unix Text in beyond compare

My problem is I'm try to compare two folders which are almost same but some little difference. But when I compare both of the folders then it shows difference in each file. When i open the file its ...
0
votes
1answer
41 views

How to know what are in a file and what aren't in another?

I doing a nrpe check for my nagios about the files that I backup, sending to Amazon S3. I have two files then, s3, which list all my files that are in Amazon already. And local which list all my files ...
1
vote
0answers
39 views

Is it possible to view a tkdiff “report” in tkdiff?

tkdiff has an option to "Write Report" in the File menu, but I couldn't find any way to open the report in tkdiff later, i.e., so I can view the diff graphically again without having to recompute it.
4
votes
2answers
3k views

Use Meld instead of Kompare in KdeSVN

i tried using Meld as external diff in KdeSVN as meld -on - (settings>configure kdesvn>diff&merge) but Meld complains that the usage is wrong: meld: error: no such option: -o Finished Usage: ...
11
votes
5answers
12k views

Is there any free *.diff file viewer? [closed]

Is there any free software that will run on Windows 7 to show syntax highlighting for *.diff files generated from comparing files? I don't want to compare files, just view the highlighted output from ...