Get rid of the dependency on RCS' merge program

diff --git a/templates/hooks--pre-applypatch b/templates/hooks--pre-applypatch
index a54751600ef85cce0480a2edfc43621104becd8c..5f56ce8053a40919cbf02010e29f185b6f9d8784 100644 (file)
--- a/templates/hooks--pre-applypatch
+++ b/templates/hooks--pre-applypatch
@@ -8,6 +8,7 @@
 #
 # To enable this hook, make this file executable.
 
+. git-sh-setup
 test -x "$GIT_DIR/hooks/pre-commit" &&
        exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
 :