5 ms·
In your experience, What's the best tool to check 3-way merge diffs under windows?
by splittingTimes 6y ago
In your experience, What's the best tool to check 3-way merge diffs under windows?
- TheDong 6y agoBoth emacs and vim can be run under windows, and both have the ability to display 3-way merges quite well. For emacs, you'd want magit + smerge or ediff. In vim, you'd want vimdiff + vim-fugitive for a few handy helpers.
- virgilp 6y agoNot free, but Araxis Merge is pretty good.
- acqq 6y ago> 3-way merge diffs under windows Is there any reason for not using kdiff3?
- pantalaimon 6y agoMeld is pretty neat
- throwaway744678 6y agoYet another option: p4merge (from Perforce) works great.
- wayneftw 6y agoBeyond Compare
- donatj 6y agoIt really does live up to it's name in my opinion. Been using it for over a decade, originally in Windows but now macOS
- SAI_Peregrinus 6y agoI use CLion (or other Jetbrains IDEs, eg PyCharms on the occasions I'm not working in C/C++/Rust). They've got a very nice built-in 3-way merge diff tool. Non-free for some of the IDEs, but if you're working with a language that has a free "community edition" this is viable. Or if you're willing to pay for a very nice IDE.
- corytheboyd 6y agoI’ll get shot down for it, but I love the JetBrains IDE visual merge tool. It’s not free, but this among other things makes it worth it for professional work.