diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-18 00:00:23 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-18 00:00:23 +0300 |
| commit | 475abf1b6386c7583d0c852767c8b1e439c1de37 (patch) | |
| tree | 9f1240d17e7ddcb6bfc00972494731ddf730b697 | |
| parent | 556b6600b25713054430b1dcaa731120eefbbd5b (diff) | |
Documentation/git-resolve: deprecated.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-resolve.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt index 4e57c2b287..0925973f12 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>. |