mirror of
https://git.freebsd.org/ports.git
synced 2025-06-10 07:10:32 -04:00
8 lines
344 B
Bash
8 lines
344 B
Bash
--- scripts/celerity/install_merge.sh.orig 2020-05-19 10:53:29 UTC
|
|
+++ scripts/celerity/install_merge.sh
|
|
@@ -6,4 +6,4 @@ echo "resources/celerity/map.php merge=celerity" \
|
|
git config merge.celerity.name "Celerity Mapper"
|
|
|
|
git config merge.celerity.driver \
|
|
- 'php $GIT_DIR/../bin/celerity map'
|
|
+ '%%PHP_CMD%% $GIT_DIR/../bin/celerity map'
|