Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

[git.git] / Documentation / git-resolve.txt

diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt
index d0583181941bc88678f803953bbffe96836e992b..7fde665fb5a0fe477c4ac534668419fef1ffe719 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,10 +8,12 @@ git-resolve - Merge two commits
 
 SYNOPSIS
 --------
-'git resolve' <current> <merged> <message>
+'git-resolve' <current> <merged> <message>
 
 DESCRIPTION
 -----------
+DEPRECATED and will be removed in 1.5.1.  Use `git-merge` instead.
+
 Given two commits and a merge message, merge the <merged> commit
 into <current> commit, with the commit log message <message>.
 
@@ -33,5 +34,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite