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.

Filter by
Sorted by
Tagged with
1
vote
0answers
15 views

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 ...
0
votes
0answers
18 views

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

How can i change the `git difftool` “change line” color?

I spend lots of hours a day working in linux consoles. As my work station has a Windows 10 OS, i use SecureCRT which works perfect. I use the "Solarized Dracula" color scheme in SecureCRT. ...
0
votes
0answers
15 views

Review all my changes in git using kdiff3

I would like to review all the changes I made before committing. With Meld I use this command. git difftool -d --tool=meld That shows a window with all the modified files, and I can click each of the ...
2
votes
0answers
82 views

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 ...
1
vote
1answer
482 views

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 ...
2
votes
2answers
239 views

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 ...
1
vote
1answer
42 views

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

Same file has different content depending on the method used to open it

Intro I am trying to setup a batch file that can backup some AppData folders to a network location using robocopy. The wincmd.ini (a file used by Total Commander) is giving me issues though: ...
1
vote
2answers
2k views

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 ...
6
votes
1answer
4k views

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). ...
4
votes
2answers
5k 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 ...
0
votes
0answers
23 views

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 ...
3
votes
2answers
6k views

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 ...
4
votes
3answers
3k views

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 ...
50
votes
5answers
41k views

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?
22
votes
1answer
15k views

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"] ...
4
votes
1answer
931 views

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,...