Deconflicter
Background

Deconflicter is a simple interactive terminal program to visualize and manage files with vcs merge conflicts in them.

Download
Screenshots