Format string needs the r flag... in the correct place. Also switching
to git merge --no-edit to try and fully automate the deploy process.