X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=zpm-merge;h=840296f35883356bd9fccc8949fc5ffbafa5a866;hp=b9cc83ef16ba81f832c559ac68201fd7ab9b3762;hb=18de5ac3f1e533d36a1c394a1381dfaa6f3ce201;hpb=64c5c5250d06e5ac98c5e6e7773ede8198fce273

diff --git a/zpm-merge b/zpm-merge
index b9cc83e..840296f 100755
--- a/zpm-merge
+++ b/zpm-merge
@@ -216,6 +216,7 @@ merge_list() {
 
 	printf "commit;\n"
 ) | zpm shell $target
+}
 
 # check for already merged packages
 if [ $update -eq 0 ] && [ $only_if_newer -eq 0 ]; then
@@ -236,8 +237,6 @@ if [ $only_if_newer -eq 1 ]; then
 	fi
 fi
 
-}
-
 if [ $one_at_a_time -eq 1 ]; then
 	for pkgid in $pkglist; do
 		if [ $verbose -ne 0 ]; then