From 2dc68de34207d4b1fdf069193c8d8a9b907d834d Mon Sep 17 00:00:00 2001
From: Ori Bernstein <ori@eigenstate.org>
Date: Tue, 30 Jul 2024 01:55:29 +0000
Subject: [PATCH] git: use native merge3 program instead of ape/diff3

---
 sys/lib/git/common.rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/lib/git/common.rc b/sys/lib/git/common.rc
index 63a2e1602..ec3ac6b6b 100644
--- a/sys/lib/git/common.rc
+++ b/sys/lib/git/common.rc
@@ -87,7 +87,7 @@ fn merge1 {@{
 
 	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