git-gui: Implement local merge operations.