summaryrefslogtreecommitdiff
path: root/git-resolve.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-resolve.sh')
-rwxr-xr-xgit-resolve.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-resolve.sh b/git-resolve.sh
index a7bc680d90..729ec65dc9 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='<head> <remote> <merge-message>'
. git-sh-setup