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 4e57c2b2877b1594b3a467c0930348221e98c672..7fde665fb5a0fe477c4ac534668419fef1ffe719 100644 (file)
--- a/Documentation/git-resolve.txt
+++ b/Documentation/git-resolve.txt
@@ -12,6 +12,8 @@ SYNOPSIS
 
 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>.