git-gui: Convert merge dialog to use class system