summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalf Furious <m@lfurio.us>2017-09-05 02:14:27 -0400
committerMalf Furious <m@lfurio.us>2017-09-05 02:14:27 -0400
commit1644a75f2562e515ffd4f9a26e5e05016601708f (patch)
tree5fd7a06c290d33f3519e6e84038a7d412b704cc8
parent9ef4ce9ff896050cb8f1fac65fe9aca7ca5aa594 (diff)
downloadsystrunk-1644a75f2562e515ffd4f9a26e5e05016601708f.tar.gz
systrunk-1644a75f2562e515ffd4f9a26e5e05016601708f.zip
Update init_wktree
create MERG file, init'd to NULL
-rw-r--r--checkout.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/checkout.sh b/checkout.sh
index a3f9f9f..d7208c9 100644
--- a/checkout.sh
+++ b/checkout.sh
@@ -18,6 +18,7 @@ function systr_init_wktree
echo "$path" >.systr/path
echo "NULL" >.systr/BASE
echo "NULL" >.systr/TRAC
+ echo "NULL" >.systr/MERG
date >.systr/updated
echo "Setup worktree at $(pwd)"