git-gui: Enable resolution of merge conflicts.