3 references to MergeDiffsAsync
Microsoft.CodeAnalysis.EditorFeatures (1)
InlineRename\InlineRenameSession.cs (1)
583
var mergeResult = await diffMergingSession.
MergeDiffsAsync
(mergeConflictHandler: null, cancellationToken: cancellationToken).ConfigureAwait(false);
Microsoft.CodeAnalysis.Features (1)
CodeRefactorings\SyncNamespace\AbstractChangeNamespaceService.cs (1)
858
var mergeResult = await diffMergingSession.
MergeDiffsAsync
(mergeConflictHandler: null, cancellationToken: cancellationToken).ConfigureAwait(false);
Microsoft.CodeAnalysis.Workspaces (1)
Workspace\Solution\Solution.cs (1)
1694
return (await session.
MergeDiffsAsync
(mergeConflictHandler, cancellationToken).ConfigureAwait(false)).MergedSolution;