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

diff --git a/Documentation/git-mv.txt b/Documentation/git-mv.txt
index 207c43a631ba6be8eb85e93b67a48fc90819b770..6756b76bb11bc17279c3f20c16d7b4ba131f5832 100644 (file)
--- a/Documentation/git-mv.txt
+++ b/Documentation/git-mv.txt
@@ -3,7 +3,7 @@ git-mv(1)
 
 NAME
 ----
-git-mv - Move or rename a file, directory or symlink
+git-mv - Move or rename a file, a directory, or a symlink
 
 
 SYNOPSIS