X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-resolve.sh;h=36b90e38494eb79b4859cf59301b5a4e6ccccea1;hb=c6d499a82fbb02e2a03fe3d858ff144fa570fb34;hp=a7bc680d90cb503c50d25b15bcaba662c5f5b49e;hpb=a8861ea81be90594d9f23d30792d6cf8d22ad1ff;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='