constconflictInput=this.instantiationService.createInstance(ConflictResolutionDiffEditorInput,this.model,nls.localize('saveConflictDiffLabel',"{0} - on disk ↔ in {1}",modifiedInput.getName(),this.contextService.getConfiguration().env.appName),nls.localize('resolveSaveConflict',"{0} - Resolve save conflict",modifiedInput.getDescription()),originalInput,modifiedInput);
constconflictInput=this.instantiationService.createInstance(ConflictResolutionDiffEditorInput,this.model,nls.localize('saveConflictDiffLabel',"{0} - on disk ↔ in {1}",modifiedInput.getName(),product.nameLong),nls.localize('resolveSaveConflict',"{0} - Resolve save conflict",modifiedInput.getDescription()),originalInput,modifiedInput);