diff options
Diffstat (limited to 'sys/src/cmd/git/merge')
| -rwxr-xr-x | sys/src/cmd/git/merge | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/src/cmd/git/merge b/sys/src/cmd/git/merge index 5517a3924..6e9791914 100755 --- a/sys/src/cmd/git/merge +++ b/sys/src/cmd/git/merge @@ -3,9 +3,9 @@ rfork ne . /sys/lib/git/common.rc fn merge{ - ourbr=/mnt/git/object/$1/tree - basebr=/mnt/git/object/$2/tree - theirbr=/mnt/git/object/$3/tree + ourbr=$gitfs/object/$1/tree + basebr=$gitfs/object/$2/tree + theirbr=$gitfs/object/$3/tree all=`$nl{{git/query -c $1 $2; git/query -c $2 $3} | sed 's/^..//' | \ subst -g '^('$ourbr'|'$basebr'|'$theirbr')/*' | sort | uniq} |