summaryrefslogtreecommitdiff
path: root/devel/phabricator/files/patch-scripts_celerity_install__merge.sh
diff options
context:
space:
mode:
Diffstat (limited to 'devel/phabricator/files/patch-scripts_celerity_install__merge.sh')
-rw-r--r--devel/phabricator/files/patch-scripts_celerity_install__merge.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/devel/phabricator/files/patch-scripts_celerity_install__merge.sh b/devel/phabricator/files/patch-scripts_celerity_install__merge.sh
new file mode 100644
index 000000000000..2d0644e038f9
--- /dev/null
+++ b/devel/phabricator/files/patch-scripts_celerity_install__merge.sh
@@ -0,0 +1,8 @@
+--- 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'