X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-resolve.txt;h=7fde665fb5a0fe477c4ac534668419fef1ffe719;hb=fd2a75972e90d34bc8d4bebe1d669645557a2192;hp=4e57c2b2877b1594b3a467c0930348221e98c672;hpb=03f99c03f806ca13b5974450409426c04af220f2;p=git.git

diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt
index 4e57c2b28..7fde665fb 100644
--- 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>.