The text 6a07bcaa41b3, as Debian 6.0 (Squeeze) shipped it.
Show three-way merge without touching index
git-merge-tree(1) on Linux now
