summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-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>.