Merge pull request #153823 from microsoft/3wm

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

@@ -5,7 +5,7 @@
 
 import * as dom from 'vs/base/browser/dom';
 import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
-import { Action, IAction } from 'vs/base/common/actions';
+import { Action, IAction, Separator } from 'vs/base/common/actions';
 import { Codicon } from 'vs/base/common/codicons';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { noBreakWhitespace } from 'vs/base/common/strings';
@@ -185,6 +185,7 @@ export class InputCodeEditorView extends CodeEditorView {
 											{ enabled: baseRange.canBeCombined }
 										)
 										: undefined,
+									new Separator(),
 									baseRange.isConflicting
 										? setFields(
 											action(

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

@@ -5,6 +5,7 @@
 
 import { CompareResult } from 'vs/base/common/arrays';
 import { IModelDeltaDecoration, MinimapPosition, OverviewRulerLane } from 'vs/editor/common/model';
+import { localize } from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { autorun, derivedObservable } from 'vs/workbench/contrib/audioCues/browser/observable';
 import { LineRange } from 'vs/workbench/contrib/mergeEditor/browser/model/lineRange';
@@ -113,8 +114,17 @@ export class ResultCodeEditorView extends CodeEditorView {
 			}
 			const count = model.unhandledConflictsCount.read(reader);
 
-			// TODO @joh
-			this._detail.setLabel(`${count} Remaining Conflicts`);
+			this._detail.setLabel(count === 1
+				? localize(
+					'mergeEditor.remainingConflicts',
+					'{0} Remaining Conflict',
+					count
+				)
+				: localize(
+					'mergeEditor.remainingConflict',
+					'{0} Remaining Conflicts',
+					count
+				));
 		}, 'update label'));
 	}
 }