ref: cca3d6b95aa2e8ebf0feda59468eb61020bb38a8
parent: 84ee79f00473db926883945991233dfe084d1823
author: Ori Bernstein <ori@eigenstate.org>
date: Tue Feb 9 18:19:25 EST 2021
git/branch: fix typo, pick better name. commmon => base
--- a/branch
+++ b/branch
@@ -95,9 +95,9 @@
}
for(ours in $dirtypaths){
- common=/mnt/git/object/$orig/tree/$ours
+ base=/mnt/git/object/$orig/tree/$ours
theirs=/mnt/git/object/$base/tree/$ours
- merge1 $ours $ours $commmon $theirs
+ merge1 $ours $ours $base $theirs
}
if(! ~ $#deleted 0){