Merge branch 'master'

diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt
index 7d3eb79033ae857fdaa164d18ef5607fb91f38d0..4e57c2b2877b1594b3a467c0930348221e98c672 100644 (file)
--- a/Documentation/git-resolve.txt
+++ b/Documentation/git-resolve.txt
@@ -1,6 +1,5 @@
 git-resolve(1)
 ==============
-v0.99.5, Aug 2005
 
 NAME
 ----
@@ -9,7 +8,7 @@ git-resolve - Merge two commits
 
 SYNOPSIS
 --------
-'git resolve' <current> <merged> <message>
+'git-resolve' <current> <merged> <message>
 
 DESCRIPTION
 -----------