Fix production merge regex to make -tracking comment optional.

Older versions of git don't include the tracking portion of the message
when merging remote branches.