Andrew's git / gitweb.git / blobdiff
?
apply --numstat -z: line termination fix.
[gitweb.git] / git-resolve.sh
diff --git a/git-resolve.sh b/git-resolve.sh
index a7bc680d90cb503c50d25b15bcaba662c5f5b49e..729ec65dc9e0ddebfe81fb4d837a5f9c83b537ee 100755 (executable)
--- 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