X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=5f70b4a25a3147987a8918d73a9d56896c9cfaa5;hp=933a51b6e78259583b56f9e06e2ca6ef1000d6e4;hb=ee731ded7d825fc801fb5e539dfc8f67383375cf;hpb=94ce252c0a5547d0462c4964d3282e0fc0e0d1c0 diff --git a/all b/all index 933a51b6..5f70b4a2 100755 --- a/all +++ b/all @@ -104,7 +104,7 @@ yesno() enter() { - $2 cd "$1" + $2 cd "$1" || exit 1 check_mergeconflict "$1" }