From: Rudolf Polzer <divVerent@alientrap.org>
Date: Sat, 8 May 2010 12:50:05 +0000 (+0200)
Subject: adminmerge real fix ;)
X-Git-Tag: xonotic-v0.1.0preview~470
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=21a4047395a57e811eb3d04b144c728fd5bae368;hp=ff786842ab496a0bfb63fb87a806b2c9fc395e34

adminmerge real fix ;)
---

diff --git a/all b/all
index e9134bf7..cf7e101d 100755
--- a/all
+++ b/all
@@ -562,7 +562,7 @@ case "$cmd" in
 		rm -rf "$patchdir"
 		;;
 	admin-merge)
-		if [ "$#" = 2 ]; then
+		if [ "$#" = 1 ]; then
 			set -- "${1%%/*}" "${1#*/}"
 		fi
 		for d in $repos; do