fix a bug that cause failure to delete a hotfix branch

When resolve conflicts manully.

fix some comment bugs in git-flow-hotfix.