which diff tool do you use?

[Morag Hughson]

I use WinMerge now. Previously have used WinDiff and KDiff3 in the past. So long as there is good keyboard support for merging and the ability to edit a line on the go, I'll be happy to use it.

[John Stewien]

WinMerge, does diff, 3 way merge, and can do a split view of a single file conflict that's spat out from git

[User 14060113]

I've been using good old WinDiff since 1997, and I still like it. Sometimes I also use Tools.DiffFiles in the Visual Studio Command Window.

[Grand Chain]

I like Araxis Merge

Ian Brockbank "Legacy systems are systems that are not protected with a suite of tests. ... You are building legacy code every time you build software without associated tests." - Mary and Tom Poppendieck, Implementing Lean Software Development.

[decaffeinatedMonkey]

I've found Source Gear DiffMerge quite good. Think it costs money though... I can't remember.

[Gary Wheeler]

Agreed.

Software Zen: delete this;

[bob davis 2022]

gvim -d

[Jeff Dworkin 2022]

ExanDiff Pro - fast, reliable, customizable, really good at merging when needed

[Brooks Vaughn US]

I've been using Beyond Compare from Scooter Software for more than 13 years and use it many times everyday. It is very powerful, flexible, and can be as simple or as complex as you like. I generate many configuration files used to deploy Azure Resources and Policies using automation scripts to a temp folder and compare that to the Git Repo folders on my local PC using the directory and file compare features in Beyond Compare. It's very easy to quickly identify the differences and locate potential issues when changing the automation scripts. When everything is correct, I can then run the scripts against the Local Master Repo, commit, merge, and trigger pipeline deployments. I also use it to help with migration to a new PC, for locating differences when hunting for a file from restored backups, for comparing CVS data files, etc... I could not do my job as effectively if using other Directory and File compare and merge tools and is worth every penny.

[Bruce Patin]

BeyondCompare is highly rated by my coworker and he made me install it.

[MikeTheFid]

I have been using Beyond Compare for over 2 decades. Nothing else has ever compared ;) to it. [Scooter Software: Home of Beyond Compare](https://www.scootersoftware.com/index.php)

Cheers, Mike Fidler "I intend to live forever - so far, so good." Steven Wright "I almost had a psychic girlfriend but she left me before we met." Also Steven Wright "I'm addicted to placebos. I could quit, but it wouldn't matter." Steven Wright yet again.

[Southmountain]

it is good to know this new tool for me:rose:

diligent hands rule....

[Southmountain]

good info to me!

diligent hands rule....

[Southmountain]

in summary, more people used Beyond Compare and I would like to give a try.:rose:

diligent hands rule....

[Brad_C]

Beyond Compare 4 is by far my favorite. I have used several over the years with varying results but BC4 is accurate and can be configured specifically for different applications. The free version these days has a 30 days(usage days) license, plenty of time to get used to it and its afforable besides.

[Geoff Gariepy]

I've been using SourceGear Diffmerge[^] for many years now. It's free and it works well on Windows, Linux and OSX. It will compare either files or folders of files.

[thewazz]

diffuse for simple file comparisons, merging. winmerge for dirs and word docs +. both free. no code integration.

[Kent K]

Visual studio's, since it's right there always. In the command window (View>Other Windows>Command window) type Tools.DiffFiles

[Glenn E Lanier II]

Another vote for UltraCompare - not terribly expensive, UltraEdit is awesome on its own. Three-way compare is helpful in the few times it's needed.

[sasadler]

Retired now but I used the JDiffPlugin in JEdit (my favorite text editor). The editor is very configurable and has a ton of plugins available. The JDiffPlugin was very well integrated with the editor.