summaryrefslogtreecommitdiff
path: root/Documentation/git-resolve.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-resolve.txt')
-rw-r--r--Documentation/git-resolve.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt
index 7d3eb79..4e57c2b 100644
--- 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
-----------