From f92c0a75ba734090409716ebc8228453791d8909 Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Wed, 6 Sep 2017 00:41:21 -0400
Subject: Update action ops

Now clearing the MERG ptr if checking out or committing
---
 checkout.sh | 1 +
 commit.sh   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/checkout.sh b/checkout.sh
index e340706..bcd9b99 100644
--- a/checkout.sh
+++ b/checkout.sh
@@ -72,5 +72,6 @@ function systr_checkout
 
     echo "Checking out files..."
     systr_rsync_normal "$path/revs/$commit/" .
+    echo "NULL" >.systr/MERG
     date >.systr/updated
 }
diff --git a/commit.sh b/commit.sh
index 964b26f..2c5e6fd 100644
--- a/commit.sh
+++ b/commit.sh
@@ -90,6 +90,7 @@ function systr_commit
 
     systr_repo_finish_commit "$commit" "$branchcommit"
     echo "$commit" >.systr/BASE
+    echo "NULL" >.systr/MERG
     date >.systr/updated
 
     if [[ "$branch" != "$branchcommit" ]]; then
-- 
cgit v1.2.3