bug-fix in git-flow-release
fix a bug that cause failure to delete a branch, when trying to finish a hotfix after resolve conflicts manully.
update topic dependency (to tgmaster)
Merge branch 't/install_on_cygwin' into refs/top-bases/t/squash
Merge commit 'refs/top-bases/t/squash' into t/squash
Merge branch 't/squash' into refs/top-bases/t/360
Merge commit 'refs/top-bases/t/360' into t/360