carta

git-mergetool(1) on Linux

The text d14b3e24ba81, as Debian 8 (Jessie) shipped it.

Run merge conflict resolution tools to resolve merge conflicts

Flags it lists

git-mergetool(1) on Linux now