"Merge" context menu command
testAttributedStringWithFormat
Use real branch names
Merge command: disable for current branch; include remote name
testMergeText
testMergeDisabled
-[XTTest commitNewTextFile:content:]
fix commit parsing
Replace -[XTRepository waitForQueue] with -[XTTest waitForQueue:]
-[XTHistoryViewController mergeBranch:] with success test
Verify merge
Merge branch 'refs/heads/mergecmd'

Conflicts:
	Xit/XTHistoryViewController.m