carta

git-mergetool(1) on Linux

The text 1001991ff42e, as Arch Linux 2026-11-01 shipped it. The page shows this text now.

Run merge conflict resolution tools to resolve merge conflicts

Flags it lists

git-mergetool(1) on Linux now