The text a4eda47fdeb0, as Debian 4.0 (Etch) shipped it.
Show three-way merge without touching index
git-merge-tree(1) on Linux now
