| commit | c1bab2889eb71bf537497fc77a2fdb6a74bc92e6 | |
| author | Jakub Narebski <jnareb@gmail.com> | |
| Fri, 25 May 2007 22:37:39 +0000 (26 00:37 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 26 May 2007 03:54:38 +0000 (25 20:54 -0700) | ||
| tree | 88e164164b9917e2f0c3aae3f6c317ed1488b6c5 | treesnapshot (tar.gz zip) |
| parent | 5adf317b31729707fad4967c1aef6cdba43d0dd3 | commitdiff |
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>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/glossary.txt | diffblobblamehistory |