|
Agreed.
Software Zen: delete this;
|
|
|
|
|
Notepad++ has a decent diff.
I also use a really old windows tool that continues to just work. It predates scroll wheels on mice.
Eclipse has good compare+merge.
DOS fc.exe for simple stuff.
|
|
|
|
|
diff
"In testa che avete, Signor di Ceprano?"
-- Rigoletto
|
|
|
|
|
|
Beyond Compare for me is great
|
|
|
|
|
For once I agree with you.
But you forgot to say that it is a paid product
M.D.V.
If something has a solution... Why do we have to worry about?. If it has no solution... For what reason do we have to worry about?
Help me to understand what I'm saying, and I'll explain it better to you
Rating helpful answers is nice, but saying thanks can be even nicer.
|
|
|
|
|
Yes it is a paid product but trial version is also availabe.
|
|
|
|
|
what is its unique feature? I would like give it a try...
diligent hands rule....
|
|
|
|
|
Like Nelek mentioned, it is a paid product, but a trial version is available. Unique at least for me: Syntax (language) recognition. Sorry for my English, I don't know how to explain it
@Nelek most probably you can explain it
I only can say it is worth the money, at least for me.
[Edit]
It is not only a diff tool, it is especially a kind of a merge tool
modified 12-Jun-22 14:19pm.
|
|
|
|
|
WinMerge works very well, it's simple free and fast.
|
|
|
|
|
Free Tool I use WinMerge and it is pretty good and enough for most use cases
Paid Tool I use BeyondCompare 4 and it is the best I have seen so far
M.D.V.
If something has a solution... Why do we have to worry about?. If it has no solution... For what reason do we have to worry about?
Help me to understand what I'm saying, and I'll explain it better to you
Rating helpful answers is nice, but saying thanks can be even nicer.
|
|
|
|
|
I use WinMerge too, but now I try to find something new...
diligent hands rule....
|
|
|
|
|
I see that you asked above...
BeyondCompare is pretty similar to WinMerge, but it is more powerful, faster with copying (you can theoretically multithread it)...
It compares the files, but not only plain text, pictures and other stuff.
I have used WinMerge for years, and I still install it in PCs I touch for family or friends, but in my PCs, I have changed to BC.
Last WinMerge I used in Win10 had already got new functions and could do more than the versions I was used to use, but I still prefer BC.
The trial version commented above... I can't say anything about it, since I use the full version.
(BTW... this reminds me I have to check for newer version)
M.D.V.
If something has a solution... Why do we have to worry about?. If it has no solution... For what reason do we have to worry about?
Help me to understand what I'm saying, and I'll explain it better to you
Rating helpful answers is nice, but saying thanks can be even nicer.
|
|
|
|
|
I used to like the one that came with subversion...
|
|
|
|
|
SourceGear | DiffMerge[^] has been my weapon of choice for the last 12 or 14 years.
Did you ever see history portrayed as an old man with a wise brow and pulseless heart, weighing all things in the balance of reason?
Is not rather the genius of history like an eternal, imploring maiden, full of fire, with a burning heart and flaming soul, humanly warm and humanly beautiful?
--Zachris Topelius
|
|
|
|
|
we use an old version of araxis merge.
CI/CD = Continuous Impediment/Continuous Despair
|
|
|
|
|
Depending on my current workflow. When it comes to standalone tools, Beyond Compare is my eternal love but in most cases, I'm using the built-in diff view of Visual Studio.
|
|
|
|
|
Btw, I don’t use a separate diff tool much these days as I’m usually running SublimeMerge which is a super fast Git GUI with built-in diff/merge.
Again, I bought my own licence because its too tedious trying to justify a work purchase.
|
|
|
|
|
it is good to know this new tool for me
diligent hands rule....
|
|
|
|
|
kdiff3 (if no-one else has mentioned that yet). It's the dog's.
Paul Sanders.
Not that the story need be long, but it will take a long while to make it short - Henry David Thoreau
Some of my best work is in the undo buffer.
|
|
|
|
|
I use UltraCompare
It is not free.
It has some nice options:
Binary compare
3-way compare
Folder compare
PDF, Word, Zip compare
Table compare
|
|
|
|
|
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.
|
|
|
|
|
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.
|
|
|
|
|
WinMerge, does diff, 3 way merge, and can do a split view of a single file conflict that's spat out from git
|
|
|
|
|
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.
|
|
|
|