From 18de5ac3f1e533d36a1c394a1381dfaa6f3ce201 Mon Sep 17 00:00:00 2001
From: Nathan Wagner <nw@hydaspes.if.org>
Date: Fri, 30 Nov 2018 13:11:01 +0000
Subject: [PATCH] fix merge

---
 zpm-merge | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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
-- 
2.40.0