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.

20 questions
73
votes
6 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,906
  • 3
  • 16
  • 21
25
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,431
  • 3
  • 13
  • 15
9
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
  • 113
  • 1
  • 5
8
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
  • 338
  • 1
  • 2
  • 11
5
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,249
  • 7
  • 33
  • 46
5
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
  • 51
  • 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,080
  • 1
  • 9
  • 16
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
  • 231
  • 1
  • 5
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
2
votes
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
  • 385
  • 1
  • 4
  • 18
1
vote
0 answers

How to configure git to use meld for diff & merge

Running Windows 11. Trying to configure meld as a diff/merge tool used with git the same way I'm using it under Linux. Meld launches OK via git difftool --dir-diff, but looks like it fails to read/write into/from the temporary locations: There was a…
laur
  • 193
  • 1
  • 2
  • 15
1
vote
0 answers

How to make kdiff3 less verbose

I installed kdiff3 on Kubuntu 22.04 LTS and noticed it is quite chatty: $ kdiff3 --version kdiff3 1.9.5 (64 bit) $ touch file1 file2 $ kdiff3 file1 file2 org.kde.kdiff3: "Loading A: .../file1" org.kde.kdiff3: "Loading B: .../file2" org.kde.kdiff3:…
user829755
  • 756
  • 1
  • 8
  • 17
1
vote
1 answer

Midnight Commander user menu command to run external diff tool

Is it possible to create an entry in Midnight Commander's "user menu", which operates on two files, possibly one from each pane? I'm trying to set up a user command that will open Meld for diffing two files (instead of the built-in differ). But I…
lonix
  • 526
  • 3
  • 15
1
vote
2 answers

Ignoring Precision Diffs in Beyond Compare

I'm comparing some files with Beyond Compare (3.3). I have some minor diffs on floating point numbers. Is there a way to tell BC to ignore such differences after a certain decimal place?
Adi Shavit
  • 477
  • 3
  • 6
  • 17
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
  • 3
1
2