Feed
Sébastien Portebois
Software architect at Ubisoft
For sublime text I use the sublime text plugin compare side-by-side.
I also use the comparison tool/merge conflict tool within gitkraken.
Great List. I would add Kdiff3, despite being old, it supports file encodings like EUC-JP that I need at work. Also, it can compare folders. I use it everyday.
Hey Dhanushka! Please tag it with General Programming so that it can reach a wider audience.
Long time user of Meld as soon as I need to compare folders/multiple files... but Differ’s way to handle JSON looks very interesting, thanks for sharing this! I’m going to give it a try in the next days ;)
For files (not folder), another great one I ’ve been using for years is P4merge , from Perforce/Helix. The merge/conflict tool is free (not open source though), works on Win/Mac/Linux and does the job really well. (With great support for 3 panes diff/merge, when you need to compare revA vers revB versus their common ancestor.... really awesome for conflict resolution!)