git-merge now accepts multiple branches