ref: d03d4c6ef7978417e7f8833577db044375d9feed
dir: /merge/
#!/bin/rc -e rfork ne . /bin/git/common.rc usage=' git/merge theirs ' fn merge{ ourbr=$1/tree basebr=$2/tree theirbr=$3/tree all=`{walk -f $ourbr $basebr $theirbr | \ sed 's@^('$ourbr'|'$basebr'|'$theirbr')/*@@g' | sort | uniq} for(f in $all){ if(! test -f $ourbr/$f) ours=/dev/null if(! test -f $basebr/$f) base=/dev/null if(! test -f $theirbr/$f) theirs=/dev/null if(! ape/diff3 -m $ourbr/$f $basebr/$f $theirbr/$f > $f) echo merge needed: $f } } gitup if(! ~ $#* 1) usage theirs=`{git/query $1} ours=`{git/query HEAD} base=`{git/query $theirs ^ ' ' ^ $ours ^ '@'} merge /mnt/git/object/$ours /mnt/git/object/$base /mnt/git/object/$theirs echo $ours $theirs > .git/index9/merge-parents