ref: 11b7f73625fa5c32842bd5efdde296587c40769b
parent: e4586ad2fddd7ab83e3d4329ccde824ed5526c7e
author: Ori Bernstein <[email protected]>
date: Tue Mar 24 00:16:01 EDT 2020
record merge parents when we have a dirty merge rc -e was bailing out early.
--- a/merge
+++ b/merge
@@ -1,4 +1,4 @@
-#!/bin/rc -e
+#!/bin/rc
rfork ne
. /sys/lib/git/common.rc