10 references to TODO_Unmerged_change_from_project_0
Microsoft.CodeAnalysis.Workspaces (1)
LinkedFileDiffMerging\AbstractLinkedFileMergeConflictCommentAdditionService.cs (1)
79
string.Format(WorkspacesResources.
TODO_Unmerged_change_from_project_0
, projectName),
Microsoft.CodeAnalysis.Workspaces.UnitTests (9)
LinkedFileDiffMerging\LinkedFileDiffMergingTests.TextMerging.cs (9)
53
<<<<<<< {string.Format(WorkspacesResources.
TODO_Unmerged_change_from_project_0
, "ProjectName1")}, {WorkspacesResources.Before_colon}
69
<<<<<<< {string.Format(WorkspacesResources.
TODO_Unmerged_change_from_project_0
, "ProjectName1")}, {WorkspacesResources.Before_colon}
104
<<<<<<< {string.Format(WorkspacesResources.
TODO_Unmerged_change_from_project_0
, "ProjectName1")}, {WorkspacesResources.Before_colon}
146
<<<<<<< {string.Format(WorkspacesResources.
TODO_Unmerged_change_from_project_0
, "ProjectName1")}, {WorkspacesResources.Before_colon}
154
<<<<<<< {string.Format(WorkspacesResources.
TODO_Unmerged_change_from_project_0
, "ProjectName1")}, {WorkspacesResources.Before_colon}
176
<<<<<<< {string.Format(WorkspacesResources.
TODO_Unmerged_change_from_project_0
, "ProjectName2")}, {WorkspacesResources.Before_colon}
182
<<<<<<< {string.Format(WorkspacesResources.
TODO_Unmerged_change_from_project_0
, "ProjectName3")}, {WorkspacesResources.Before_colon}
202
<<<<<<< {string.Format(WorkspacesResources.
TODO_Unmerged_change_from_project_0
, "ProjectName1")}, {WorkspacesResources.Before_colon}
222
<<<<<<< {string.Format(WorkspacesResources.
TODO_Unmerged_change_from_project_0
, "ProjectName1")}, {WorkspacesResources.Before_colon}