void (@NotNull VcsException e) { LOG.info("mergeFiles ", e); final String description = GitBundle.message( "conflict.resolver.unmerged.files.check.error.notification.description.text", myParams.myErrorNotificationAdditionalDescription ); VcsNotifier.getInstance(myProject).notifyError( CONFLICT_RESOLVING_ERROR, myParams.myErrorNotificationTitle, new HtmlBuilder().appendRaw(description).br().appendRaw(e.getLocalizedMessage()).toString() ); }