Fixes issue when Git has an 'ADD/ADD' conflict after a merge

extensions/git/src/commands.ts

@@ -187,6 +187,7 @@ export class CommandCenter {
 
 				return resource.resourceUri;
 
+			case Status.BOTH_ADDED:
 			case Status.BOTH_MODIFIED:
 				return resource.resourceUri;
 		}
@@ -198,6 +199,7 @@ export class CommandCenter {
 		switch (resource.type) {
 			case Status.INDEX_MODIFIED:
 			case Status.INDEX_RENAMED:
+			case Status.BOTH_ADDED:
 				return `${basename} (Index)`;
 
 			case Status.MODIFIED: