Documentation/git-resolve: deprecated.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jan 17, 2007 at 13:00 UTC
475abf1b6386c7583d0c852767c8b1e439c1de37
1 file changed
+2
Documentation/git-resolve.txt
+2
@@ -12,6 +12,8 @@ SYNOPSIS
12
13
DESCRIPTION
14
-----------
15
+DEPRECATED. Use `git-merge` instead.
16
+
17
Given two commits and a merge message, merge the <merged> commit
18
into <current> commit, with the commit log message <message>.
19