summaryrefslogtreecommitdiff
path: root/Documentation/git-resolve.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-17 21:00:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-17 21:00:23 (GMT)
commit475abf1b6386c7583d0c852767c8b1e439c1de37 (patch)
tree9f1240d17e7ddcb6bfc00972494731ddf730b697 /Documentation/git-resolve.txt
parent556b6600b25713054430b1dcaa731120eefbbd5b (diff)
downloadgit-475abf1b6386c7583d0c852767c8b1e439c1de37.zip
git-475abf1b6386c7583d0c852767c8b1e439c1de37.tar.gz
git-475abf1b6386c7583d0c852767c8b1e439c1de37.tar.bz2
Documentation/git-resolve: deprecated.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-resolve.txt')
-rw-r--r--Documentation/git-resolve.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt
index 4e57c2b..0925973 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>.