Documentation: Add definition of "evil merge" to GIT Glossary