carta

git-mergetool(1) on Linux

The text 3ba579d36afd, as Debian 10 (Buster) shipped it.

Run merge conflict resolution tools to resolve merge conflicts

Flags it lists

git-mergetool(1) on Linux now