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
0answers
35 views

How to provide user “hints” to “diff”? [closed]

Sometimes, when I am diffing two text files (usually in vimdiff), the diff algorithm gets confused and associates the wrong lines with one another. Once that's happened, the rest of the diff is often ...
1
vote
1answer
19 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 ...
3
votes
4answers
448 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 ...
1
vote
0answers
9 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.
0
votes
0answers
59 views

View the diff between My Version and Server Version of MS Excel file

In Excel 2013 Desktop, I received the following warning: UPLOAD FAILED: We're sorry, someone updated the server copy and it's not possible to upload your changes now. [ Keep My Version ] [ Keep ...
1
vote
0answers
18 views

Programantic Diff

I'm localising a piece of Javascript (the github repo is here) for Spanish speaking users. I have both the English and Spanish text as PDFs and I have the software in English. The pdfs look like ...
3
votes
2answers
66 views

View patch files with different region highlighted [closed]

Is there a desktop application, console utility, or preferably Emacs extension, which can highlight the different regions in a patch file? An example is the diff viewer of GitHub. The different part ...
0
votes
1answer
74 views

Launch emacs with ediff-files (of ediff-directories) from command line

I would like to launch emacs to ediff either files or directories. For example, I'd like something like: emacs -f ediff-files file1 file2 But when I do this, it doesn't take file1 and file2 as the ...
0
votes
2answers
56 views

Can gnu diff recursively compare only filenames in different folder structures?

I know that I can recursively compare two dirs with diff -qr and output only the differences. However, this appears to compare file positions within the trees (for example, /a/b/file01 != ...
0
votes
2answers
168 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 ...
1
vote
2answers
191 views

Compare two files and output the differences

I am aware of diff and using loops but I just cant seem to really get what I need with diff. I'm basically looking to compare two files (file2.txt and file2.txt) and just get the output of what is ...
0
votes
0answers
28 views

An issue with git diff command

What could be causing this error on Mac OS X (mavericks)? I have git installed with homebrew ➜ whereis git /usr/bin/git ➜ which git /usr/local/bin/git ➜ git --version git version 2.0.4 Now when I ...
1
vote
1answer
76 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 ...
0
votes
0answers
72 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 ...
1
vote
1answer
26 views

How to mark files to manage the diff output

My collegues are maintaining a configuration file, which is deployed to production/test/staging environments by SaltStack. I am maintaining this file by using diff to see what has changed and code the ...
2
votes
0answers
47 views

Patching .iso files

sometimes I have only little bandwidth. Also I have access to a machine with high bandwidth via ssh over the low bandwidth line. So let's say, there's a new version of my favorite live system. The ...
0
votes
1answer
140 views

How to capture diff output from find command exec?

I am using Ubuntu (Precise 12.04) I am trying to write some bash script to see if file is changed via awk replace by using diff command. I did a test with the following: #! /bin/bash diff fileA.htm ...
1
vote
1answer
272 views

Incremental Backups of ntfsclone Images

I am attempting to make compressed incremental backups of a Windows partition using ntfsclone on Linux. Currently, I am making full ntfsclone images using something like the following command: sudo ...
2
votes
1answer
126 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 ...
0
votes
1answer
27 views

Recursively compare file identities in Windows environment using only standard Windows commandline tools

I want to ensure that deep directories of files are identical after copying. I've read this answer: http://superuser.com/a/414216/214579 However, neither fc or comp offer recursion. How would one ...
3
votes
2answers
868 views

How do I compare two folders recursively and generate a list of files and folders that are different?

tl;dr and an example I'm looking for a way to compare two folders recursively and output the relative paths all files (and folders) that are different (by size or by timestamp, à la rsync). For ...
1
vote
0answers
63 views

OSX Terminal: FTP upload only if file size different

I am currently using FileZilla to backup my Documents. The manual procedure for this is as follows: Sign in to FTP using username and password Open Documents folder on FTP site Drag documents from ...
1
vote
2answers
214 views

compare two directory trees

I have two music libraries, one a newer version than the other. I would like to compare them to figure which files I need to copy from new music tree to old. I have tried diff --brief -r ...
0
votes
2answers
44 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
1answer
19 views

How to group “Only in” lines in diff at the beginning of the output

I did: diff -r directory1/ directory2/ Some files are different, and some files were only in one tree or the other, creating several Only in ... lines. How do I group these lines at the beginning ...
0
votes
0answers
437 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
57 views

Dynamic diff of one file

I am trying to diff one file over time using process substitution in bash. diff <(cat /path/to/file | sort; sleep 20) <(cat /path/to/file) I also tried: diff <(cat /path/to/file | sort ...
1
vote
2answers
46 views

Find two newest change files and compare them

I have a script that wgets a .txt file and datifies the names. I'd like to diff the changes between the newest & next-to-newest file. This is how I am able to select them: ls -t -l | awk ...
1
vote
1answer
62 views

recursive diff of files case-insensitive

How do I run a recursive diff when the filenames are the same but have different cases? For instance: ./Root/Directory/FileName.txt ./Branch/directory/filename.txt diff -r -i Root Branch only ...
0
votes
1answer
38 views

How can I `diff` two Accumulo tables?

If I wanted to compare two similar Accumulo tables and highlight their differences, how could I do this? My first thought is creating database dumps and running Unix diff over the files, but that ...
0
votes
0answers
83 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 ...
0
votes
0answers
209 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
45 views

Attempting to combine diff command and display last modified between dupes

I am attempting to do something a bit unique, and cannot find the right terminal command line to use. I am attempting to essentially solve for the following problem: I have two volumes of data that ...
4
votes
1answer
3k 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
1answer
51 views

How am I supposed to use diff in this situation?

I recently asked a Google Groups forum for help with setting up a Vagrant/Chef/Django VM thingamajigger, and I received the following help: The fabfile.py had some errors for me. After I fixed ...
0
votes
1answer
86 views

How to make redirected input count as command output

I have a simple C console program that takes some keyboard input and outputs prompts and calculations. I also have two text files: a file with input for the program, and a file that contains the ...
0
votes
2answers
49 views

What is the right tool to diff filecontents of a directory in OSX?

I know that I can use Git for some cases, but I still believe that there exists a simpler solution by default. Does there exists any tools by default in the newest OSX for the diff of filecontents in ...
0
votes
2answers
3k views

How to compare content of two files?

I got a mission to compare the content of hundreds of pair files. I have to quickly compare each pair and to provide an answer if that pair is equal (in content) or not. The files could be text or ...
2
votes
2answers
2k views

Diff to actually totally ignore whitespace

I am looking for an application that will diff two files, and actually ignore all whitespace, so for example: class foo { bar spaz } is equally equivilant to class foo{bar spaz} or, as ...
7
votes
1answer
8k 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
66 views

DIff ignore arguments from a file doesn't seem to be working

When I run the following command, it doesn't seem to be ignoring what I specify in the ignore.txt file. I have tried adding some of the arguments with -x, but there are way too many to do that by ...
1
vote
1answer
84 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
229 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 ...
3
votes
1answer
802 views

Recursive diff and symlinks

I'm trying to diff two directories using (well) diff. However, diff actually follows symlinks and compares differences between the targeted files. I can't seem to find a way to not have diff do this. ...
0
votes
1answer
38 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
1answer
54 views

recursive diff with per-file preprocessing

How do I get a combined effect of diff -r left_dir right_dir and diff <(cat left_file | myfilter) <(cat right_file | myfilter) without much scripting?
2
votes
3answers
298 views

Compare file system properties/attributes of two files

There are many methods that can be used to compare the data of two files. That is not what I'm interested in here. How can I easily compare or "perform a diff" of what could be called (perhaps you ...
1
vote
2answers
935 views

Diff -b and -w difference

From the diff manpage: -b, --ignore-space-change ignore changes in the amount of white space -w, --ignore-all-space ignore all white space From this, I infer that the difference ...
0
votes
1answer
539 views

Modern looking interface for diff/meld type program (Mac OSX)

I'm using Mac OSX, and I was wondering if there was a good program for comparing two text files for differences? I have meld and the interface looks pretty old. It's just a small cosmetic thing, but ...