shithub: front

Info  •  Files  •  Log  •  Branches

git: use native merge3 program instead of ape/diff3

--- a/sys/lib/git/common.rc

+++ b/sys/lib/git/common.rc

@@ -87,7 +87,7 @@

 	if(mergeperm $ours $base $theirs){

 		mkdir -p `{basename -d $tmp}

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

+		if(! merge3 $ours $base $theirs > $tmp)

 			echo merge needed: $out >[1=2]

 		mv $tmp $out

 		git/add $out

-- 

⑨