The text 33563a0c1db4, as Debian 6.0 (Squeeze) shipped it.
Reuse recorded resolution of conflicted merges
git-rerere(1) on Linux now
