cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git: use native merge3 program instead of ape/diff3

Browse source
This commit is contained in:
Ori Bernstein 2024-07-30 01:55:29 +00:00
parent 0136b08a10
commit 2dc68de342
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/lib/git/common.rc
View file

@ -87,7 +87,7 @@ fn merge1 {@{
if(mergeperm $ours $base $theirs){ if(mergeperm $ours $base $theirs){
mkdir -p `{basename -d $tmp} 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] echo merge needed: $out >[1=2]
mv $tmp $out mv $tmp $out
git/add $out git/add $out