X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=e19793567a34d224808a78fc4e1832b49a508248;hp=9a0a6d0ca0041aafda51f3dc693d65dd34a57737;hb=27fd916063a5cd6f7de90d4b976fc4108ae51a6c;hpb=27afc09631e16d5f97b95dd24a479f5ebeabcc76

diff --git a/all b/all
index 9a0a6d0c..e1979356 100755
--- a/all
+++ b/all
@@ -166,7 +166,8 @@ case "$cmd" in
 				if git config branch.$r.remote >/dev/null 2>&1; then
 					if ! verbose git pull; then
 						check_mergeconflict "$d"
-						exit 1 # FATAL
+						echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
+						read -r DUMMY
 					fi
 				fi