From e0c1e7d2429fa182b14eee4f6944f815e5e573e5 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Wed, 31 May 2017 11:06:43 -0700 Subject: [PATCH] Title case (fixes #27569) --- extensions/merge-conflict/src/mergeDecorator.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/merge-conflict/src/mergeDecorator.ts b/extensions/merge-conflict/src/mergeDecorator.ts index d07e7fe5681..0dd5ad6f6c6 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') } }); -- GitLab