carta

git-merge-tree(1) on Linux

The text 8aff3d66bc5a, as Debian 9 (Stretch) shipped it.

Show three-way merge without touching index

git-merge-tree(1) on Linux now