Super User Stack Exchange
Super User Stack Exchange

Questions tagged [difftool]

A diff tool is any program (such as Unix 'diff', WinMerge, KDiff, etc.) which can perform a comparison between two or more files.

17 questions
57
votes
5 answers

How can I diff binary files in git?

In order to diff binary files in git, I assume I need to set up a difftool. What difftools work? How do you put the parameters in?
Nick Retallack
  • 1,736
  • 3
  • 15
  • 21
23
votes
1 answer

Kaleidoscope for git difftool

I tried using kaleidoscope for git difftool to compare two branches. So I installed ksdiff and setted it like follow in my .gitconfig [diff] tool = kaleidoscope [difftool "kaleidoscope"] cmd = ksdiff --changeset $(cd $(dirname "$LOCAL")…
svassr
  • 1,331
  • 3
  • 11
  • 15
8
votes
1 answer

How to show the exact difference of words in WinMerge?

Can I setup WinMerge so that it shows me the exact difference of single words? Up to now the whole word/phrase is highlighted, even if only one character is different (see picture for an example). The URL in line 11 is highlighted completely, even…
Stefan Seidner-Britting
  • 103
  • 1
  • 5
5
votes
2 answers

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 single pair of files. I'd really like to be able to…
alecbz
  • 308
  • 2
  • 11
4
votes
3 answers

Various methods of trying to set up a git diff tool lead to "fatal: cannot exec [...] : Bad address"

I'm on Linux Mint 17 64-bit. Just purged git and re-installed with apt. Deleted ~/.gitconfig. Only configuration I do after supposedly fresh install is (while inside a repo) git config diff.tool vimdiff Then I run git difftool…
user354932
  • 41
  • 1
  • 4
4
votes
1 answer

Setting TextMate 2 as Git's difftool

Is it possible to set TextMate 2 as the default Git difftool/mergetool? If so, what are the commands? I have found instructions for the diffmerge tool here, but I would like to try it with text mate, but I know that are the commands to use. I am…
Tiago Veloso
  • 1,070
  • 1
  • 9
  • 15
3
votes
2 answers

How do I suppress output with fc when there are no differences

I want to compare a bunch of files in a cmd.exe batch file using fc. Unfortunately, fc reports for every pair of compared files that it didn't find any differences if there are no differences. How can I change that behaviour so that it stays silent…
René Nyffenegger
  • 2,097
  • 6
  • 32
  • 42
2
votes
0 answers

How can I interactively diff large binary files?

I'm trying to compare hex-dumps of some 500GB disk images. I can easily view parts of the files by piping hd into less. I'd like something similar to interactively diff them without having to read the entire files. I'd like to manually examine the…
Wes Toleman
  • 221
  • 1
  • 4
2
votes
2 answers

Diff tool for finding a minimal set of changes

I have two versions of a text file, with many changes (including whitespace, linebreak differences, etc.). All of the diff tools I have tried (diff, diff --minimal, wdiff, kdiff3, meld) fail spectacularly to even come close to properly aligning the…
John Pardon
  • 121
  • 3
1
vote
1 answer

vsDiffMerge not running as Sourcetree external merge tool

I'm trying to set up vsDiffMerge (from Visual Studio Professional 2017) as my external merge/diff tool for SourceTree. However, when I try to resolve merge conflicts with the external tool, nothing happens. I know I got it to work before, but I had…
inejwstine
  • 111
  • 2
1
vote
1 answer

How to automatically create a tarball from differences in directories?

I have a situation where I have 2 large directory trees, an old and a new. Most files are the same, but some are different and/or missing in the old version. I would like to find a way to automatically create a tar file that contains: a) all files…
Jon
  • 43
  • 1
  • 5
1
vote
2 answers

How to use Winmerge for archive compare

I need to compare jar files (i.e. zip files) with java files in it. My WinMerge v. 2.14.0.0 Unicode refuses to work with my 7-zip v. 16.04 [64 bit]. The official guide did not help. Is there any exact instructions to compare archives with WinMerge?
Loom
  • 365
  • 1
  • 4
  • 17
0
votes
0 answers

How to stop continual launching of app?

I'm using Tower for Git. On a commit, I clicked "Difftool". This launches my merge program (P4Merge). It launches it for every file that needs to be diffed, one at a time. So every time I close P4Merge, the next diff is opened. Tried quitting…
Marty
  • 395
  • 1
  • 6
  • 18
0
votes
0 answers

Kdiff3 on a mac has no finder integration?

It's very easy to use kdiff3 to show file differences on windows by right clicking files from Windows Explorer and selecting compare from the kdiff3 menu. Isn't there any way to get such integration in the Mac Finder?
draca
  • 211
  • 1
  • 7
0
votes
0 answers

How can I diff the contents of an XML file and a PDF?

At work, editors create books in XML which is then imported into Indesign and then archived as PDFs of the final print copy. Additional edits are made directly to InDesign and final PDF during proofs and layouts which means the XML goes out of sync…
Dan Maharry
  • 101
  • 2
1
2