The text 33664a58cd69, as Debian 7 (Wheezy) shipped it.
Show three-way merge without touching index
git-merge-tree(1) on Linux now
