diff options
Diffstat (limited to 'sys/src/cmd/git/merge')
| -rwxr-xr-x | sys/src/cmd/git/merge | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/src/cmd/git/merge b/sys/src/cmd/git/merge index 6e9791914..3d7a97a74 100755 --- a/sys/src/cmd/git/merge +++ b/sys/src/cmd/git/merge @@ -7,13 +7,12 @@ fn merge{ 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} + all=`$nl{{git/query -c $1 $2; git/query -c $2 $3} | sed 's/^..//' | sort | uniq} for(f in $all){ ours=$ourbr/$f base=$basebr/$f theirs=$theirbr/$f - merge1 $f $theirs $base $ours + merge1 ./$f $theirs $base $ours } } |