Merge git://git.kernel.org/pub/scm/gitk/gitk into maint

[git.git] / Documentation / git-resolve.txt

diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt
index 0925973f12edcb863ede32cf1e95d9e9ebac1cf5..7fde665fb5a0fe477c4ac534668419fef1ffe719 100644 (file)
--- a/Documentation/git-resolve.txt
+++ b/Documentation/git-resolve.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-DEPRECATED.  Use `git-merge` instead.
+DEPRECATED and will be removed in 1.5.1.  Use `git-merge` instead.
 
 Given two commits and a merge message, merge the <merged> commit
 into <current> commit, with the commit log message <message>.