From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 25 May 2007 22:37:39 +0000 (+0200)
Subject: Documentation: Add definition of "evil merge" to GIT Glossary
X-Git-Tag: v1.5.2.1~13^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c1bab2889eb71bf537497fc77a2fdb6a74bc92e6?ds=sidebyside;hp=c1bab2889eb71bf537497fc77a2fdb6a74bc92e6

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

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---