Better diff for deleted file in merge conflict. Fixes #88973 (#91245)

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
microsoft · Nov 5, 2020 · 818d57d · 818d57d
1 parent 36e2868
commit 818d57d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
@@ -347,7 +347,9 @@ export class CommandCenter {
 				right = toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: repository.root });
 			}
 		} else {
-			if (resource.type !== Status.DELETED_BY_THEM) {
+			if (resource.type === Status.DELETED_BY_US || resource.type === Status.DELETED_BY_THEM) {
+				left = toGitUri(resource.resourceUri, '~1');
+			} else {
 				left = this.getLeftResource(resource);
 			}