Add git-mergetool to run an appropriate merge conflict resolution program

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 031fcd5190bf4baef7d87534ef5b6a39fe8985a9..493474b2eeabb2f7928b0e9f91cfd1ff64763a6d 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -3,7 +3,7 @@ git-archive(1)
 
 NAME
 ----
-git-archive - Creates a archive of the files in the named tree
+git-archive - Creates an archive of files from a named tree
 
 
 SYNOPSIS