carta

git-merge-file(1) on Linux

The text 28a6e5b59e16, as Debian 9 (Stretch) shipped it.

Run a three-way file merge

Flags it lists

git-merge-file(1) on Linux now