Added tab funcionality to GitMergeWindow. Moved abort merge button to where the mode buttons are.