It does support all the merging feature that GitHub provides. There are features request already to support even more merge methods. :)