From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 7 Jun 2005 00:39:14 +0000 (-0700)
Subject: git-resolve-script: don't wait for three seconds any more
X-Git-Tag: v0.99~331
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3f4eff75308b86fe462a2333108470bd6556e3c4;p=git.git

git-resolve-script: don't wait for three seconds any more

We used to overwrite peoples dirty state.  We don't any more.  So don't
print the scary message and don't delay, just do the update already.
---

diff --git a/git-resolve-script b/git-resolve-script
index 186b234b2..74fb2875b 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