carta

git-merge-file(1) on Linux

The text 3677ef2908d5, as Debian 10 (Buster) shipped it.

Run a three-way file merge

Flags it lists

git-merge-file(1) on Linux now