ref: f12b5c3161f316418737a7bd7231ffe386478ded
dir: /merge/
#!/bin/rc -e
rfork ne
. /sys/lib/git/common.rc
fn merge{
ourbr=$1/tree
basebr=$2/tree
theirbr=$3/tree
all=`$nl{walk -f $ourbr $basebr $theirbr | \
subst -g '^('$ourbr'|'$basebr'|'$theirbr')/*' | sort | uniq}
for(f in $all){
ours=$ourbr/$f
base=$basebr/$f
theirs=$theirbr/$f
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 -3 -m $ours $base $theirs > $f)
echo merge needed: $f
if(test -f $f)
git/add $f
if not
git/rm $f
}
}
gitup
flagfmt=''; args='theirs'
eval `''{aux/getflags $*} || exec aux/usage
if(! ~ $#* 1)
exec aux/usage
theirs=`{git/query $1}
ours=`{git/query HEAD}
base=`{git/query $theirs ^ ' ' ^ $ours ^ '@'}
if(~ $base $theirs)
die 'nothing to merge, doofus'
if(! git/walk -q)
die 'dirty work tree, refusing to merge'
if(~ $base $ours){
>[1=2] echo 'fast forwarding...'
echo $theirs > .git/refs/`{git/branch}
git/revert .
exit ''
}
echo $ours >> .git/index9/merge-parents
echo $theirs >> .git/index9/merge-parents
merge /mnt/git/object/$ours /mnt/git/object/$base /mnt/git/object/$theirs
>[1=2] echo 'merge complete: remember to commit'
exit ''