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

learn more… | top users | synonyms

3
votes
1answer
353 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
votes
0answers
15 views

Which diff tool can support brace/brackets matching for JavaScript [on hold]

Which diff tool can support brace matching for JavaScript? Tool like Beyond Compare can support syntax highlight but does not support parentheses or brackets matching.
10
votes
3answers
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 ...
0
votes
1answer
32 views

exclude socket files during 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 all socket files and only socket files? I am using diff --...
1
vote
1answer
11 views

How to get Side-by-side layout in Beyond Compare 4's Picture Compare

Beyond Compare 4's Picture Compare has 2 images on top and the composite image below. This suits landscape images, but wastes plenty of space for highly portrait images on 16:9 monitors: This video ...
16
votes
2answers
16k views

How can I make 'diff -X' ignore specific paths and not file names?

Doing: diff -r -X <ignore-list> <src-dir> <dest-dir> doesn't seem to make diff ignore entries in <ignore-list> if they are of the form <dir>/<file>. Entries of ...
0
votes
1answer
13 views

What are these odd characters appearing when I use P4Merge with TortoiseSVN?

When comparing files, I get these characters at the start of the diff. Image of the strange characters I'm not sure exactly what more information to provide, but will be watching this question if ...
1
vote
1answer
22 views

Is it possible to have meld open all files at once when used with “git difftool”?

Meld is capable of loading many files at once (in tabs). However when used with git difftool, Git will ask if you want to view each file (which can be slow and annoying to have to keep opening and ...
13
votes
10answers
29k 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 ...
3
votes
1answer
114 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 ...
3
votes
1answer
420 views

Diffing an entire hard drive, available tools?

There's an existing question similar to this that didn't get answered in the proper context (a massive volume of data to compare) at all, so I'm trying again here. I'm using SuperDuper to maintain a ...
9
votes
1answer
3k 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
0answers
15 views

Binary Patch Directory Recursively in Windows?

What is the easiest way to accomplish this in Windows? I have files that are over 1 gigabyte and also many smaller files. They are mostly not text files. Old_Folder (dozens of files) New_Folder (...
1
vote
2answers
113 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
2answers
83 views

compare and find differences of 2 huge text files (50 gb)

I want to find the differences between two text files (more than 50 GB) each. I tried diff but, I got memory exhausted problem. I am using Windows7. My code is in PHP. I was calling diff from my ...
3
votes
3answers
1k views

Using 'diff' command over ssh

If I have a folder with several files on my computer, and a copy of the same folder on a remote server, is it possible to run 'diff' through ssh so I can see the differences between my copy and the ...
0
votes
1answer
270 views

How to find similarities in two text files?

Given two text files, how can I find passages that are alike? I know that I can use Meld or another diff tool to show the differences, but how to do the reverse thing? For example, here are two texts ...
166
votes
11answers
241k 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 ...
-1
votes
1answer
47 views

How can you pass output of find command to a diff command with multiple files?

I find 5 files ending with .csv. Now I want to compare the content of these files using diff command. How can I perform both actions in one command on a Linux terminal on bash? I want to do something ...
4
votes
4answers
759 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 "diff"...
0
votes
1answer
196 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'...
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 ...
0
votes
1answer
26 views

Using 'diff' compare usernames from file1 to file2 containing emails

I am trying to identify active accounts over dead accounts and was wondering if diff along with grep or sed or regex can be used, instead of writing a long program. File1 (usernames) ...
0
votes
1answer
33 views

How to get the difference between 2 cells

I have an Excel file like below. The value in column C should be the difference between A and B (A is always longer, B is always A substring). If both values in A and B are same, C will be empty. ...
5
votes
3answers
2k 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

diff stop after first difference

I'd like to perform a diff on 2 files and have it cease at the first difference. I don't require that the command be done via diff, of course, but I do require that the actual command cease once the ...
4
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?
0
votes
2answers
32 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
71 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
97 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
11 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
57 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 ...
12
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
2answers
57 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
13 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, ...
3
votes
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
15 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 ...
0
votes
1answer
51 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 ...
11
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 ...
0
votes
1answer
69 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 ...
11
votes
4answers
12k 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
69 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
23 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 ...
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 ...
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
446 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 - ...
8
votes
1answer
8k 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
120 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
133 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 ...