shithub: git9

Info  •  Files  •  Log  •  Branches

Add files that got merged

--- a/merge

+++ b/merge

@@ -25,6 +25,11 @@

 			theirs=/dev/null

 		if(! ape/diff3 -m $ours $base $theirs > $f)

 			echo merge needed: $f

+

+		if(test -f $f)

+			git/add $f

+		if not

+			git/rm $f

 	}

 }