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

learn more… | top users | synonyms

10
votes
2answers
5k 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 ...
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 ...
1
vote
3answers
2k views

Confirm that two filesystems are identical, ignoring special files

/media/A and /media/B should be identical, but I want to confirm before deleting one. Duplicate file finders don't work, because they'll find two copies of the same file within B, for instance. I ...
1
vote
0answers
185 views

StatSVN generated XML is slightly out of date

There are no StatSVN questions on superuser, but why not start? ;-) Here's my problem... I generate a log from subversion with: svn log -v --xml > log.xml The latest revision that shows up in ...
8
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 ...
1
vote
1answer
136 views

How do I diff an RSS feed against last time it was run?

I have a feed - for example 2011 Patents of ultraviolet screens If I run this next week, I would like to see if there had been an update since last time I looked - are there any feed readers that ...
0
votes
1answer
107 views

Compare Guitar Pro files

I am looking for a tool that can diff/compare Guitar Pro (5) files. Which of these file types should/could I use to compare tablatures? GP5 exports these file types: MIDI ASCII MusicXML GP5 These ...
2
votes
1answer
1k views

How to configure BeyondCompare to mark newline differences as unimportant?

Newline additions in the middle of a line in BeyondCompare are marked as important. I want them to become unimportant. How to do that? Example: A: <img src="a.gif"/> B: <img src="...
5
votes
2answers
344 views

“diff” terabyte files

Are there any tools that allow to "diff" text files of terabyte size?
9
votes
2answers
6k views

How can I diff two network dumps from tcpdump or Wireshark?

I'm having a problem with one of our customers' embedded computers. They seem to discard some network packets which they should not. I can capture the TCP communication from a managed switch outside ...
8
votes
3answers
12k views

GUI tool for applying patch files for windows

There any number of good GUI diff-tools for windows (I use Araxis Merge, and kDiff3), but none of them (that I can find) will apply a patch file. I would expect it to work like this: I open a base ...
10
votes
3answers
2k views

How to ignore whitespace in Kaleidoscope (diff tool)?

In Kaleidoscope, how do I configure it to ignore whitespaces?
1
vote
0answers
427 views

How to diff two mails in outlook

I know a guy who is always re-sending me (rather long) emails with little changes. (i.e. a changed name or date) Is there an easy way (preferrably an addin in outlook) to visual diff (visual like ...
0
votes
1answer
76 views

Recommend a diff tool to show and explain some changes in a document [closed]

Now I'm in process of contract negotiation with a private company. They sending me the contract, I'm making some changes and then sending back to them for verification. Now they asking me to explain ...
0
votes
1answer
154 views

File comparison, one-to-many

I need a program that allows comparing one text file to many others without having to open each one manually. This is how it would work: 1) select the file which all others will be compare with 2) ...
3
votes
1answer
179 views

How to scroll the diff buffer easily in Emacs while point is on the minibuffer

In Emacs, after a lot of editing, I press C-x s (save-some-buffers), then Emacs asks "Save file ...? (y,n,.... d ...)" for each file, I sometimes answer d (diff) to see the changes, but then it's not ...
0
votes
1answer
104 views

Ungroup diff's output

I've got two files, and output of diff looks like this: 33428,33429c33428,33429 < lucid-security|main|icedtea-6-jre-cacao|6b20-1.9.2-0ubuntu1~10.04.1 < lucid-security|main|icedtea6-plugin|6b20-...
11
votes
1answer
11k 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
1answer
151 views

svn diff software that simply downloads changesets

Does anyone know any simple software (preferably without installation) that allows to download changesets of specified revisions and save them as "changesetX.diff/.patch"? For some reason Windows ...
0
votes
1answer
240 views

Howto make a diff of a bios or backup/ restore all bios settings

I'm using an Dell M90 Precision Laptop which has a NVidia Quadro FX 2500M graphics card and is running Windows XP. Laptop has been running fine - but a few weeks ago screen went 'white' - restarted ...
18
votes
2answers
10k views

How to diff file names in two directories (without writing to intermediate files)?

I am trying to do something along the lines of: diff `ls -1a ./dir1` `ls -1a ./dir2` But that doesn't work for obvious reasons. Is there a better way of achieving this (in 1 line), than this? ls -...
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: ...
1
vote
2answers
213 views

diff unified output; supress @@ lines?

When using diff, is there a way to suppress the first two lines (listing the file names and times) and all the lines beginning with @@ in the output? All I want are the lines that show what to delete ...
2
votes
2answers
442 views

diff + print only string from the source file without extra information from the diff

When I perform diff between old to new files I get that DDDC string exsist in the old file by the sign "<" as the follwoing diff -w old new 103a104 > BBB 224c225 < DDDC But please advice ...
1
vote
2answers
487 views

Check if there are changes on file system (Ubuntu 10.10)

I have to get my PC to the service because sometimes the system hangs and suddendly reboots without any reason. Anyway, I will create a test user if they want to start the computer. Moreover I think ...
3
votes
1answer
564 views

Mercurial: How I can use external tool for diff?

I want to use kdiff3 as a tool for comparing different versions of a repository. Is there a way how one can do it?
11
votes
5answers
13k 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 ...
2
votes
1answer
1k views

View Configuration File Changes With RPM or Yum

How do I view the changes made to package configuration files (installed using rpm/yum)? I created a FreeRadius server that does MAC Authentication, and I just want to get the lines that I have ...
6
votes
4answers
5k 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 ...
2
votes
5answers
3k views

Visual diff for multiple file pairs on Linux

I need a GUI program for Linux (Ubuntu Karmic) like tkdiff, which can display 2 files side-by-side, and highlight the differing lines, and it accepts multiple file pairs on the command line, but ...
19
votes
3answers
14k views

How to diff large files on Linux

I'm getting a diff: memory exhausted error when trying to diff two 27 GB files that are largely similar on a Linux box with CentOS 5 and 4 GB of RAM. This is a known problem, it seems. I would expect ...
8
votes
4answers
4k views

Similarity and/or Diff of two ODT documents (Linux)

I have two ODT documents, they have very close contents, I want to compare them to see how similar they are. The best would be to have a similarity percentage, if not possible, an alternative would ...
11
votes
2answers
1k views

Is there any way to find similar files (not duplicates)?

My final goal is refactoring code written by my coworkers. So, is there a tool which can find files differing in only few words? (Edit: this is for a Mac, but others might like non-Mac answers too.)
4
votes
5answers
11k views

How do you compare multiple folders with same files to find all different versions of the same file?

I've got 700+ folders with the same set of 200+ classic asp files (basically text files) in each folder. Over the years various people have made minor changes inside these asp files. I need an utility ...
1
vote
2answers
127 views

Diffing file contents

I have two plain text files, each file is containing a list of strings sorted alphabetically with one string per line. I want to diff the files and have an output of all strings that exist only in ...
21
votes
4answers
14k views

vimdiff: Jump to next difference inside line?

vimdiff is very handy for comparing files. However, I often use it on files with long lines and relatively few differences inside the lines. vimdiff will correctly highlight differences inside a line ...
6
votes
4answers
3k views

Tool for comparing a single line of text

Is there a tool for comparing two lines of text? All the tools I have compare on a line level, when I really need a character level diff in the line. Windows or *nix, GUI or command line, I don't ...
5
votes
1answer
2k views

Microsoft Word 2007 diff

Does Word 2007 come with diff functionality? If not, what's the easiest way of creating a patch file between two documents showing the changes I have made?
0
votes
1answer
195 views

Get changes to local config files with apt

When I'm updating a package and a new configuration file is shipped, I'm asked whether I want to keep my version, install the new one or view the differences. As I have to document an older server, I'...
32
votes
4answers
41k views

How do I do a binary diff on two identically sized files under Linux?

I have two identically sized files, and I need to do a binary diff to check whether they're the same. I'm currently runnnig diff file1.img file2.img but it's taking quite a while to process my 4 ...
23
votes
1answer
12k views

Listing lines from just one file in DIFF

I would like to get (GNU)DIFF to printout only lines that are different in one file. So given ==> diffa.txt <== line1 line2 - in a only line3 line4 changed line5 ==&...
63
votes
2answers
26k views

Ignore .svn when doing `diff -r`

diff has an option --recursive (-r) to do a comparison between two directories (the files inside them). Is there a way to make diff ignore certain sub-directories (eg: .svn)? $ diff -r src1/ src2/
12
votes
6answers
572 views

Line-length-tolerant XML diff

I've looked at the answers to this question, and unfortunately none of them has helped me so far. Not to beat about the bush, the second edition of C# in Depth is now in copy edit. I want to be able ...
3
votes
3answers
1k views

WYSIWYG editor for structured text (suitable for SVN versioning)

I'm looking for an open source cross platform WYSIWYG editor that I can use to write documentation. I'm not looking for a web based solution - i.e. it should work without a web server, and I want ...
161
votes
11answers
236k 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 ...
5
votes
4answers
5k views

Checking whether binary files are the same? [duplicate]

Possible Duplicate: Binary Diff Tools On Windows What would be the easiest way of veryfying whether two binary files are the same, without actually opening them, checking versions and such in ...
3
votes
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?
6
votes
4answers
1k views

Pass the output of ls to diff

I have one file that contains a list of files from a server, and a local folder that I compare to that manifest. Obviously, I do 'ls -1 > listing_local' and then diff that file with listing_server. ...
9
votes
2answers
5k views

interactive/visual merge tool for console?

I'm a big fan of meld - a visual diff and merge tool for Gnome. It shows two files (or directories) side by side with their differences highlighted and I can easily select which parts I want to move ...
1
vote
1answer
497 views

Tool to make a DIFF between HTML tables?

I am seeking a tool to make a DIFF between tables displayed in HTML tables - typically tables with identical layout, filled only with numbers, the numbers differing from on version to another. Raw ...