expand parameters in the remote branch name of merge options
also expand the name being displayed in the logs
Merge pull request #116 from cosmin/expand-merge-branch-name

expand parameters in the remote branch name of merge options