Fixes microsoft#159184 (microsoft#159187)

Author: hediet

src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts

@@ -53,6 +53,9 @@ export class InputCodeEditorView extends CodeEditorView {
 				if (modifiedBaseRange === activeModifiedBaseRange) {
 					blockClassNames.push('focused');
 				}
+				if (modifiedBaseRange.isConflicting) {
+					blockClassNames.push('conflicting');
+				}
 				const inputClassName = this.inputNumber === 1 ? 'input1' : 'input2';
 				blockClassNames.push(inputClassName);
 

src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.ts

@@ -55,6 +55,9 @@ export class ResultCodeEditorView extends CodeEditorView {
 					if (modifiedBaseRange === activeModifiedBaseRange) {
 						blockClassNames.push('focused');
 					}
+					if (modifiedBaseRange.isConflicting) {
+						blockClassNames.push('conflicting');
+					}
 					blockClassNames.push('result');
 
 					result.push({

src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css

@@ -62,25 +62,38 @@
 	background-color: var(--vscode-mergeEditor-change-word-background);
 }
 
-.merge-editor-block {
+/* BEGIN: .merge-editor-block */
+
+.merge-editor-block:not(.handled) {
 	background-color: var(--vscode-mergeEditor-conflict-unhandledUnfocused-background);
+}
+
+.merge-editor-block:not(.handled):not(.focused) {
 	border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
 }
 
-.merge-editor-block.focused {
+.merge-editor-block:not(.handled).focused {
 	border: 1px dashed var(--vscode-mergeEditor-conflict-unhandledFocused-border);
 }
 
-.merge-editor-block.handled {
+.merge-editor-block.handled:not(.focused) {
 	border: 1px solid var(--vscode-mergeEditor-conflict-handledUnfocused-border);
+}
+
+.merge-editor-block.handled:not(.focused).conflicting {
 	background-color: var(--vscode-mergeEditor-conflict-handledUnfocused-background);
 }
 
 .merge-editor-block.handled.focused {
 	border: 1px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
+}
+
+.merge-editor-block.handled.focused.conflicting {
 	background-color: var(--vscode-mergeEditor-conflict-handledFocused-background);
 }
 
+/* END: .merge-editor-block */
+
 .gutter.monaco-editor>div {
 	position: absolute;
 }