The text 307c752dbf6d, as Debian 5.0 (Lenny) shipped it.
Show three-way merge without touching index
git-merge-tree(1) on Linux now
