Tool to help resolving git conflicts
Build for i686-glibc, version 1.0.8.1_3. Builds for all architectures.