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.

1
vote
1answer
37 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
18 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: ...
0
votes
0answers
22 views

Is there a way to choose a different diff tool to show inside TortoiseHG Workbench?

I've looked around and every time someone mentions diff tools in context of TortoiseHG, they mean the external diff tool. But I'd like to change the internal TortoiseHG Workbench GUI app's diff tool ...
0
votes
0answers
59 views

Remove case differences between contents of two diff'ed files?

I often need to diff two versions of a text file where the majority of differences are just changes to case. Generally these differences are spurious and I'd like to eradicate them from the newest ...
1
vote
1answer
868 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 ...
2
votes
1answer
2k 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
2k 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
20 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
4k 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
2k 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 ...
18
votes
1answer
11k 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"] ...
3
votes
1answer
758 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,...