ref: ae5e3f530fabd31d72459cd459b0f666cced192a
parent: ea1f78d7ebd7ac4866c86152e1fc0c425522ca15
author: Ori Bernstein <ori@eigenstate.org>
date: Tue Apr 14 20:05:12 EDT 2020
don't allow merging dirty working trees
--- a/merge
+++ b/merge
@@ -39,6 +39,8 @@
if(~ $base $ours || ~ $base $theirs)
die 'nothing to merge, doofus'
+if(! git/walk -q)
+ die 'dirty work tree, refusing to merge'
echo $ours >> .git/index9/merge-parents
echo $theirs >> .git/index9/merge-parents