git-gui: support for diff3 conflict style