Can it merge ordinary directories (in addition to git-bracnehs)?