ref: 200e2fee22af9421f649525bf8f67cb945e94fc0
parent: ab639e6aa05f72268f63ad17ea68285ebba82f11
author: Ori Bernstein <[email protected]>
date: Sat Aug 8 23:38:32 EDT 2020
Dedup parent commits in merging. When merging multiple branches (or redoing a merge for one branch) duplicate parents could sneak in. Don't do that.
--- a/commit
+++ b/commit
@@ -80,7 +80,7 @@
fn parents{if(test -f .git/index9/merge-parents)
- parents=`{cat .git/index9/merge-parents}+ parents=`{cat .git/index9/merge-parents | sort | uniq}if not if(~ $initial true)
parents=()
if not