Documentation/git-resolve: deprecated.

Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years ago · 475abf1b63
1 changed files with 2 additions and 0 deletions
--- a/Documentation/git-resolve.txt
+++ b/Documentation/git-resolve.txt
@ -12,6 +12,8 @@ SYNOPSIS
				@@ -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>.