A syntax-aware git merge driver for a growing collection of programming languages and file formats.
About this app
Mergiraf can solve a wide range of Git merge conflicts. That's because it's
aware of the trees in your files! Thanks to its understanding of your language,
it can often reconcile the needs of both sides.
You can teach Mergiraf a new language in a completely declarative way. It's a
nonviolent animal, so it prefers that over imperatives.
A free (as in freedom) media player for the command line. It supports a wide variety of media file formats, audio and video codecs, and subtitle types.
GS-Base is a database that lets you store any type of data, text and numeric fields, dates, long text memo fields, files, images, code snippets with syntax highlighting for 16 programming languages.