cvsimport: have default merge regex allow for dashes in the branch name