projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff78684
)
adminmerge real fix ;)
author
Rudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 12:50:05 +0000
(14:50 +0200)
committer
Rudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 12:50:05 +0000
(14:50 +0200)
all
patch
|
blob
|
history
diff --git
a/all
b/all
index e9134bf779b19e058e4adfda906b18ad90d67fdf..cf7e101d3472e7fd9cf697583f5b1994d7173508 100755
(executable)
--- 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