Documentation/git-resolve: deprecated.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt
index 4e57c2b2877b1594b3a467c0930348221e98c672..0925973f12edcb863ede32cf1e95d9e9ebac1cf5 100644 (file)
--- a/Documentation/git-resolve.txt
+++ b/Documentation/git-resolve.txt
@@ -12,6 +12,8 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
+DEPRECATED.  Use `git-merge` instead.
+
 Given two commits and a merge message, merge the <merged> commit
 into <current> commit, with the commit log message <message>.