Support for merging branches in a repository