ref: bd4c1bbccb31efc87d32b6d63ebc904b21ffee6a
parent: 77f14aa86695e59554eb4698436ce1b76b93bdd2
author: Ori Bernstein <ori@eigenstate.org>
date: Mon Feb 10 00:19:12 EST 2020
each merge commit goes on its own line.
--- a/merge
+++ b/merge
@@ -35,4 +35,5 @@
base=`{git/query $theirs ^ ' ' ^ $ours ^ '@'}merge /mnt/git/object/$ours /mnt/git/object/$base /mnt/git/object/$theirs
-echo $ours $theirs > .git/index9/merge-parents
+echo $ours >> .git/index9/merge-parents
+echo $theirs >> .git/index9/merge-parents