From: Junio C Hamano <junkio@cox.net>
Date: Wed, 17 Jan 2007 21:00:23 +0000 (-0800)
Subject: Documentation/git-resolve: deprecated.
X-Git-Tag: v1.5.0-rc2~48
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=475abf1b6386c7583d0c852767c8b1e439c1de37;p=git.git

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 4e57c2b28..0925973f1 100644
--- 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>.