From: Nathan Wagner <nw@hydaspes.if.org>
Date: Fri, 30 Nov 2018 13:11:01 +0000 (+0000)
Subject: fix merge
X-Git-Tag: v0.3.0~6
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=18de5ac3f1e533d36a1c394a1381dfaa6f3ce201

fix merge
---

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