[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised

diff --git a/Documentation/git-resolve-script.txt b/Documentation/git-resolve-script.txt
index 8dd84a381a1972f4da1cb699e51b7a8c648ea35f..99c399a073cd9cd69783312a6930f3fb2cca55f0 100644 (file)
--- a/Documentation/git-resolve-script.txt
+++ b/Documentation/git-resolve-script.txt
@@ -1,6 +1,6 @@
 git-resolve-script(1)
 =====================
-v0.1, May 2005
+v0.99.4, Aug 2005
 
 NAME
 ----
@@ -18,7 +18,8 @@ This script is used by Linus to merge two trees.
 
 Author
 ------
-Written by Linus Torvalds <torvalds@osdl.org>
+Written by Linus Torvalds <torvalds@osdl.org> and
+Dan Holmsand <holmsand@gmail.com>.
 
 Documentation
 --------------