shithub: git9

Info  •  Files  •  Log

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){