From d8e9ca30edd02b0c6809cd856db5caf086a4b788 Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Wed, 6 Sep 2017 03:45:16 -0400
Subject: Spawn merge helper routines in a subshell

This is to prevent those functions from overwriting variables used by
the merge function.
---
 merge.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/merge.sh b/merge.sh
index 48f907b..c693790 100644
--- a/merge.sh
+++ b/merge.sh
@@ -105,7 +105,7 @@ function systr_merge
 
     commit="$1"
 
-    systr_merge_tree "$commit"
+    (systr_merge_tree "$commit")
     echo "$commit" >.systr/MERG
 
     # resolve conflicts #
@@ -163,7 +163,7 @@ function systr_merge
     done
 
     # apply merge #
-    systr_merge_finish "$commit"
+    (systr_merge_finish "$commit")
 }
 
 ##
-- 
cgit v1.2.3