summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
Diffstat (limited to 'git-resolve-script')
-rw-r--r--git-resolve-script3
1 files changed, 0 insertions, 3 deletions
diff --git a/git-resolve-script b/git-resolve-script
index 186b234..74fb287 100644
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -36,9 +36,6 @@ if [ "$common" == "$merge" ]; then
fi
if [ "$common" == "$head" ]; then
echo "Updating from $head to $merge."
- echo "Destroying all noncommitted data!"
- echo "Kill me within 3 seconds.."
- sleep 3
git-read-tree -u -m $head $merge || exit 1
echo $merge > "$GIT_DIR"/HEAD
git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat