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

learn more… | top users | synonyms

4
votes
1answer
2k 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
190 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
370 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
363 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
312 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?
6
votes
5answers
7k views

Is there any free *.diff file viewer?

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 ...
3
votes
2answers
2k views

Comparing a folder with a git repository

I have a folder now once exported from a git repository, and the git repository itself: / /now/ /repository.git/ I'd like to compare the files in now to the current state of the repository. While ...
1
vote
1answer
838 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 ...
5
votes
3answers
3k 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
2k 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 ...
12
votes
3answers
7k 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 ...
2
votes
4answers
2k 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 ...
9
votes
2answers
844 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
8k 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
109 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 ...
17
votes
4answers
10k 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 ...
3
votes
4answers
1k 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
173 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, ...
19
votes
4answers
24k 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 ...
13
votes
1answer
6k 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 ...
41
votes
2answers
16k 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/
11
votes
6answers
410 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
843 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 ...
73
votes
7answers
110k 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 ...
4
votes
4answers
3k 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 ...
0
votes
2answers
817 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?
20
votes
7answers
32k views

Binary Diff Tools On Windows

I have two different binary files, and I want to compare their difference. Is there a free GUI based binary diff tool that is available on Windows?
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. ...
8
votes
2answers
3k 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
299 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 ...
3
votes
3answers
616 views

Verifying successful file transfer after moving lots of large files

I'm working on transferring a lot of files (>100GB, several thousands of files) over my network to a new Mac. Once the transfers are done I'd like to be able to verify that all of the files were ...
2
votes
4answers
453 views

Why are there binary differences among compressed files generated exactly the same way from the exact same starting file?

I use the "diff" command to compare two compressed files generated using zip on the exact same starting file and they are reported as being different. However, when I uncompress them and use the ...
18
votes
6answers
14k 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 ...
0
votes
4answers
1k views

What do these instructions mean in plain English?

I know it's for the linux program patch, but if I try to use it, I get the following error: missing header for unified diff at line 4 of patch malformed patch at line 5: quit Instead, I'd like to ...
7
votes
1answer
2k views

how can I tell vimdiff to ignore whitespace?

I made a number of changes in a file I'm working on, including indentation changes. I'm using vimdiff to compare the file to the original version, and I don't want to see these changes, since they're ...
5
votes
1answer
7k views

How can Powershell on Windows 7 diff two files?

Can Powershell on Windows 7 diff two files on the hard drive? Sometimes a text compare is helpful, but otherwise just telling whether a file is identical to another file is helpful. thanks. Update: ...
10
votes
4answers
10k views

How to diff directories for different files, but not line-by-line

I want to see, recursively, files that are different in two directories. Diff can do this, but it shows me the line-by-line differences, which I don't want. Is there a tool that does this, or a way to ...
0
votes
1answer
147 views

Have you used DiffVue? It is a diff utility but I don't know much about it

When I search download.com, I found this diffvue software, and it sounds quite promising with cheap price. But its size is huge comparing to other software. I tested only a basic things and I like ...
2
votes
3answers
4k views

How can I get diff to show only added and deleted lines

How can I get the unix command diff show only added and deleted lines? If diff can't do it, what tool can?
5
votes
4answers
7k views

Windows Command Line Binary Diff Tools

does anyone know of any windows command line diff tools that are free? I need to compare two binary files and see if they are different or not. Im not interested in how they are different i just need ...
7
votes
4answers
1k views

svn diff including annotate/blame-alike information of when changes were made by who

Can you add annotate/blame-alike information to svn diff, so that for every changed line it includes which user and revision changed that line? For example, an annotate-diff comparing revisions 8-10 ...
9
votes
10answers
15k views

What program to use to compare big files under Windows?

I'd like to compare two files under Windows, each about 1Gb in size. I tried Total Commander and WinMerge and both ended with Out of memory error. I'm running Vista Home Premium 64bit with 8GB of RAM ...
2
votes
3answers
1k views

tool to display patch file

What tools exist to display patch files? A text editor is usually good enough. ColorDiff can add color. Ideally though the tool would also show intra-line differences like KDiff3.
17
votes
3answers
8k views

How to Use WinMerge as the Diff tool for Mercurial

I'm using the Mercurial distributed version control system, and I'm wondering how I can configure it to use WinMerge instead of its own internal diff tool. I've already got WinMerge as the merge ...
2
votes
5answers
7k views

Difftool for Ubuntu like OS X's Opendiff

What is the best difftool for Git repos like OS X's Opendiff?
3
votes
4answers
3k views

Mac OS X diff tool for Microsoft Word docs?

I am using svn for version control and want to be able to compare 2 revisions of a MS Word doc side-by-side. I am aware of Araxis Merge but this converts the doc to text and compares which is more ...
4
votes
4answers
737 views

Tools for diffing two pages / files in a browser

I want to be able to diff the source of two pages, or even plain text files that are open in two browser windows. The only thing I can find is the PageDiff plugin for Firefox, but is there anything ...
18
votes
6answers
9k views

Alternative for WinMerge in Ubuntu

I need to compare/diff/merge files in an easy way. In windows I would use WinMerge. What alternatives for this are available in Ubuntu? The things I must be able to do: See 2 files line by line ...