github.com/mkchoi212/fac (go): Easy-to-use CUI for fixing git conflicts
Keywords: command-line|conflict-resolution|cui|git|go|golang|utility