diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2007-05-26 00:37:39 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-25 20:54:38 -0700 |
| commit | c1bab2889eb71bf537497fc77a2fdb6a74bc92e6 (patch) | |
| tree | 88e164164b9917e2f0c3aae3f6c317ed1488b6c5 /git-am.sh | |
| parent | 5adf317b31729707fad4967c1aef6cdba43d0dd3 (diff) | |
| download | git-c1bab2889eb71bf537497fc77a2fdb6a74bc92e6.tar.gz | |
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>
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions