git-mediate

JSON →
cli 1.1.0 ·shell
install reviewed

Utility to help resolve merge conflicts. Available on Homebrew and apt.