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

learn more… | top users | synonyms

0
votes
1answer
479 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 ...
0
votes
1answer
75 views

Recursive diff on directories says files differ, but no output when I diff on the files

(in the Linux Terminal) I used diff --recursive --brief dir1 dir2 and it tells me that File dir1/file and dir2/file differ But then, I try: diff dir1/file dir2/file and there is no output ...
2
votes
1answer
145 views

linux diff: is there a way to list differences by when the files were last modified?

In the Linux terminal, I'm using diff --recursive --brief dir1 dir2 A couple of weeks ago, dir1 and dir2 were identical, but they have both been modified since then. I would like to order to ...
0
votes
0answers
45 views

Improve diff viewer in Visual Studio 2010

In Visual Studio 2010 you can compare a local file with the latest version/workspace version. This opens up a diff viewer showing the two versions of the file side by side with the lines that are ...
0
votes
1answer
511 views

git difftool doesn't launch Beyond Compare from Powershell or command prompt

I'm trying to use Beyond Compare 3 as my diff tool with git. I configured git with the following commands: (source: Using Beyond Compare With Version Control Systems) git config --global diff.tool ...
1
vote
0answers
615 views

How to only add lines using patch?

I'd like to be able to use diff & patch in order to write new lines to a file. To clarify what I mean a bit: Original file: test1.repo exclude=mongo* exclude=sqlite* ...
15
votes
3answers
3k 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 ...
1
vote
2answers
3k 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 ...
1
vote
0answers
227 views

Vimdiff functionality in Sublime Text 2

I wanted to know if it is possible to have a vimdiff like functionality to check for diff and have synchronized scrolling of two (or more) files in Sublime Text 2 just like vimdiff? Thanks
0
votes
1answer
170 views

Given 2 sorted files - delete all words found in another

On Linux I have two text files with russian UTF8 words sorted with sort -u (actually I used :%sort u in Vim, it produces same results). One of the files dict.txt contains around 700000 words of my ...
0
votes
1answer
51 views

How to see what's changed on git

A bunch of new commits have been made on the remote git repository, and you want to see what's changed from the version you have checked out on your computer previously. How do you do so?
4
votes
1answer
262 views

Diff between two directories and keep only the unchanged ones

I need to diff two directories: A: /path1/ B: /path2/ The directory A contains all files and subdirectories that are also contained in B. The files in A (and in its subdirectories) can have ...
1
vote
1answer
326 views

Subtract files from one another recursively between two similar directories

I'm trying to concoct a way to grab two (nearly identical) directories and show me the difference between all files in the two directories. Looking for two different things: 1- List all files ...
2
votes
2answers
375 views

How to compare two files for non-printing characters

To share a configuration file between two computers, I emailed the file to myself via my gmail account. When I loaded the conf on the second computer, the program had trouble reading every line. ...
1
vote
1answer
566 views

Key to close a fold in vimdiff?

Pressing spacebar on a + fold in vim in diff mode causes the fold to open. What and where do I key if I want to close the fold again?
1
vote
1answer
237 views

Complete file system diff

I have a program which I need to install on top of Windows 8. Trouble is, the program makes changes to a few files which make another program not work, chances are that registry settings are involved, ...
1
vote
2answers
230 views

formatting of the diff output

I have 2 files that I want to differ. File B is produced appending some new line to file A. I want to highlight the appended data by using diff. I would like to avoid printing out the '>' characters ...
3
votes
0answers
279 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 ...
0
votes
1answer
180 views

How can I automatically compare and merge a large number of text files?

Due to a series of technical snafus with Dropbox and Simplenote syncing, my main writing folder, which contains text files mostly in Markdown format, is all messed up. I have about 500 unique files, ...
3
votes
1answer
3k views

diff directories, excluding one folder inside

I think I have two directories with the same content, but I want to check it. Also, I want to exclude a folder that is inside both directories. How can I do it?
0
votes
1answer
26 views

How do I get a good directory difffile I can use to patch/what to use for patch

I'd like to make a clean diff of a directory that allows me to later use a gui patch program for windows to apply the diffile. If possible I don't want to have to deal with hardcoded paths in the ...
0
votes
1answer
47 views

diff 2 files by (class) method or function?

This just occurred to me today. I've primarily been diffing files whole text using tools like BeyondCompare, etc. Was wondering if there's a tool or functionality to do selective diffs of 2 files, ...
1
vote
4answers
105 views

Is there a program that will show a tree of the differences in two file trees?

In windows I manually back up from time to time by formatting my external drive and copying the contents of my data partition over. Inevitably there is a difference in the number and size of the files ...
2
votes
2answers
813 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 ...
2
votes
2answers
1k views

Tool for performing a PDF Diff? [duplicate]

Possible Duplicate: How to compare the differences between two PDF files? Are there any tools available for performing a diff between two PDF files? Or am I better off just extracting the ...
2
votes
2answers
785 views

Tool for diffing large files

When I use "diff" to find the difference between two large data files, diff A.txt B.txt > dif.info it is output: diff:memory exhausted or add the argument "-H" diff -H A.txt B.txt > ...
2
votes
2answers
75 views

Create zipfile from changed files in 2 directories

What I'm trying to do is create a zipfile (or some different archive) which contains all the changed files from 2 provided directories. The path of the files should be persisted in the archive, so the ...
1
vote
2answers
304 views

diff and patch tool

I'm trying to generate patches for a bunch of files I changed. I'm using Meld which does a great job of diff’ing the files in a nice visual manor, then it allows me to save and generate a patch file ...
3
votes
2answers
2k views

Diff two files side by side, new lines on left column for no match

This has been getting the good half of my day and I am sure such a solution must exist (if not, then I am programming one), but alas, here is the question. I have two files, hpc.sorted.modules.txt ...
2
votes
1answer
732 views

How to diff part of a file

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
77 views

diff for multiple files

I use "diff -y" command to compare 2 results of different versions of my program line by line. Like this: 1 1 123 | 234 asdf | qerq Is there analog for multiple files, which will allow to ...
1
vote
1answer
2k views

why doesn't my .gitconfig work? (for external diff)

I added this in ~/.gitconfig: [diff] external = mvimdiff [difftool] prompt = false and made a 755 /bin/mvimdiff that: #!/bin/sh mvim -d "$2" "$5" in order to invoke MacVim as my git ...
0
votes
1answer
53 views

How can I get a diff-like comparison of two files without the “change” sections?

I have two files that I would like to compare in terms of additions and deletions only. For example, if I diff these two files: start old old old end and: start old old but now new new new end I ...
1
vote
0answers
64 views

Does Sibling Node Order Matter In Canonical XML? [closed]

When using $ xmllint --c14n one.xml > 1.xml $ xmllint --c14n two.xml > 2.xml $ diff 1.xml 2.xml Would it matter if the order of the sibling nodes were different? I.e. are these the same? ...
1
vote
1answer
537 views

Show git diff HEAD~1 of file not touched in recent commits

In Git, to see the differences with a previous commit I run this: git diff HEAD~1 To see the commits related with a single file I would run this: git log --oneline file But if I run the ...
4
votes
3answers
1k views

Using diff on a long one line file

I have a file that has only one line. Its size is about 20,000 bytes. The file has been modified, and I wanted to know where. I thought using diff, but it shows me the complete line, because it ...
0
votes
2answers
270 views

Find the different two Excel sheets when having identical row

I have two excel sheets with same column Names and Format. And it has one identical row(can use as Primary Key) id. I want to get the diff. table 1: id Name GPA ----+------+------- 1 | AA ...
2
votes
2answers
851 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
156 views

How do most sync programs monitor file changes? [closed]

Do sync programs like Dropbox typically track file changes by doing byte by byte comparisons, or using hashes, or using diff / keeping local commit logs like version control, or what?
1
vote
4answers
2k views

Difference between folders

How can I compare recursively 2 folders with same structure. With using diff or git diff from bash command line?
1
vote
1answer
68 views

How to patch something with diff output?

I want to apply the below changes to some code that someone has written and provided a diff output from. Is there a way given only the output below I can easily create a patch and apply it, or (as ...
3
votes
1answer
154 views

Updating a modified Prestashop

I don't know if this is the proper forum for this; didn't really seem like a Stack Overflow question, so if I'm in the wrong here, do point me to the correct SE site. Anyway, I have a Prestashop ...
2
votes
1answer
191 views

Directory diff with text file output

It appears I was unable to save the scripts I used for converting some Subversion repos to Mercurial ones, more specifically the filemaps. How can I get diffs between two directories (added/removed ...
1
vote
1answer
235 views

About regexp in emacs ediff-directories

I want to compare two directories which have similar hierarchy. With "M-x ediff-directories" within Emacs, I was prompted to input a regexp to constrain the name of files I want to compare. For ...
1
vote
1answer
136 views

Graphical comparison tool to use with svn on Mac OS 10.7

Is it possible to view "svn diff" output graphically on Mac OS? Most of the graphical diff programs allow you to view only one file per time. Which is very inconvenient when you use svn and have ...
1
vote
2answers
1k views

Comparing files for similarities

Is there a standard Linux tool that looks for similarities between two files? The diff tool works best comparing files that are mostly the same, and outputs where they differ. I'm looking for a tool ...
1
vote
1answer
278 views

How can I compare two files, from a website, on the command line?

I need to do the following: Basically, I want to be able to compare two text (or text-equivalent, i.e. not binary) files which are held on a website, e.g.: ...
5
votes
2answers
1k views

Vimdiff and git all at once

I use vimdiff as my difftool with git. Let's say that I've changed twelve files. The problem is that sometimes I run git diff and around the fourth or fifth file I see something that I want to ...
3
votes
1answer
484 views

How to create Delta / Changed files from directories?

I'm trying to create a "changed files" package from one directory to another and need to find a Linux/Unix tool/utility that will be able to handle this. Example: Package_1.1/ (old) Package_1.2/ ...
0
votes
1answer
71 views

Diff between files in different directories

I have the follow directory structure ./goodboys/a.txt ./goodboys/b.txt ./badboys/a.txt.boy ./badboys/b.txt.boy I am using zsh. I want to diff all *.txt in goodboys with *.txt.boy in badboys. I am ...