Skip to content

Commit

Permalink
Address PR feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
mavasani committed Nov 30, 2017
1 parent b4deac0 commit c24e51e
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private async Task<LinkedFileMergeResult> MergeLinkedDocumentGroupAsync(

// Automatically merge non-conflicting diffs while collecting the conflicting diffs

var textDifferencingService = _oldSolution.Workspace.Services.GetService<IDocumentTextDifferencingService>() ?? new DefaultDocumentTextDifferencingService();
var textDifferencingService = _oldSolution.Workspace.Services.GetService<IDocumentTextDifferencingService>();
var appliedChanges = await textDifferencingService.GetTextChangesAsync(_oldSolution.GetDocument(linkedDocumentGroup.First()), _newSolution.GetDocument(linkedDocumentGroup.First()), cancellationToken).ConfigureAwait(false);
var unmergedChanges = new List<UnmergedDocumentChanges>();

Expand Down

0 comments on commit c24e51e

Please sign in to comment.