carta

git-merge-file(1) on Linux

The text 15496c7c38a7, as Debian 12 (Bookworm) shipped it.

Run a three-way file merge

Flags it lists

git-merge-file(1) on Linux now