Fac – CUI for fixing Git conflicts
github.com