diff --git a/extensions/merge-conflict/src/mergeDecorator.ts b/extensions/merge-conflict/src/mergeDecorator.ts index d07e7fe5681dd03d2396dcc2bda6935269d07a8c..0dd5ad6f6c6a85e192cf3f70d283df3cc5ad2e05 100644 --- a/extensions/merge-conflict/src/mergeDecorator.ts +++ b/extensions/merge-conflict/src/mergeDecorator.ts @@ -80,7 +80,7 @@ export default class MergeDectorator implements vscode.Disposable { backgroundColor: new vscode.ThemeColor('merge.currentHeaderBackground'), color: new vscode.ThemeColor('editor.foreground'), after: { - contentText: ' ' + localize('currentChange', '(Current Change)'), + contentText: ' ' + localize('currentChange', '(Current change)'), color: new vscode.ThemeColor('descriptionForeground') } }); @@ -95,7 +95,7 @@ export default class MergeDectorator implements vscode.Disposable { color: new vscode.ThemeColor('editor.foreground'), isWholeLine: this.decorationUsesWholeLine, after: { - contentText: ' ' + localize('incomingChange', '(Incoming Change)'), + contentText: ' ' + localize('incomingChange', '(Incoming change)'), color: new vscode.ThemeColor('descriptionForeground') } });