carta

git-merge-file(1) on Linux

The text a4055f0957e3, as Debian 11 (Bullseye) shipped it.

Run a three-way file merge

Flags it lists

git-merge-file(1) on Linux now