X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-resolve.sh;h=36b90e38494eb79b4859cf59301b5a4e6ccccea1;hb=fd2a75972e90d34bc8d4bebe1d669645557a2192;hp=a7bc680d90cb503c50d25b15bcaba662c5f5b49e;hpb=09f5dc406a9e6630af881108af815f6c3fb6d9df;p=git.git diff --git a/git-resolve.sh b/git-resolve.sh index a7bc680d9..36b90e384 100755 --- a/git-resolve.sh +++ b/git-resolve.sh @@ -5,6 +5,10 @@ # Resolve two trees. # +echo 'WARNING: This command is DEPRECATED and will be removed very soon.' >&2 +echo 'WARNING: Please use git-merge or git-pull instead.' >&2 +sleep 2 + USAGE='