WinMerge

Both

Free file and folder comparison and merging tool

More in Dev Tools

Lightweight but powerful code editor with extensions ecosystem

Distributed version control system for tracking code changes

Modern terminal application for command-line tools and shells

API development and testing platform

Programming Language