revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-09 16:32:39 +01:00
Code Issues Releases Wiki Activity

Make Celerity merger Windows compatible

Browse source
This commit is contained in:
Jakub Vrana 2013-04-23 11:11:21 -07:00
parent 6a0ac6b532
commit 5c0333cef9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/celerity/install_merge.sh
View file

@ -6,4 +6,4 @@ echo "src/__celerity_resource_map__.php merge=celerity" \
git config merge.celerity.name "Celerity Mapper" git config merge.celerity.name "Celerity Mapper"
git config merge.celerity.driver \ git config merge.celerity.driver \
'$GIT_DIR/../scripts/celerity_mapper.php $GIT_DIR/../webroot' 'php $GIT_DIR/../scripts/celerity_mapper.php $GIT_DIR/../webroot'