git-pull.sh: Fix call to git-merge for new command format