ref: 040e524a216bb6c0ce150cb3479ee7c1f984a283
parent: 899c43e87e495c82b0897b0970d26b9bfc583c7f
author: Ori Bernstein <[email protected]>
date: Mon Jul 8 05:49:16 EDT 2019
Save the merge parents when merging.
--- a/merge
+++ b/merge
@@ -35,3 +35,4 @@
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