| commit | 475abf1b6386c7583d0c852767c8b1e439c1de37 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junkio@cox.net> | Wed Jan 17 13:00:23 2007 -0800 |
| committer | Junio C Hamano <junkio@cox.net> | Wed Jan 17 13:00:23 2007 -0800 |
| tree | 9f1240d17e7ddcb6bfc00972494731ddf730b697 | |
| parent | 556b6600b25713054430b1dcaa731120eefbbd5b [diff] |
Documentation/git-resolve: deprecated. Signed-off-by: Junio C Hamano <junkio@cox.net>
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 @@ 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>.