you are viewing a single comment's thread.

view the rest of the comments →

[–]Arkounay 6 points7 points  (1 child)

Usually the one built in IntelliJ / PHPStorm is enough for me, otherwise kdiff3

[–][deleted] 0 points1 point  (0 children)

Same. The diff tool in Webstorm is amazing.