From a88d97d63edef71f5a574616a5c045839e25f4ca Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Fri, 2 Jun 2017 14:23:48 -0700 Subject: [PATCH] Title case (#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 d30863eca9a..f988eef1fed 100644 --- a/extensions/merge-conflict/src/mergeDecorator.ts +++ b/extensions/merge-conflict/src/mergeDecorator.ts @@ -84,7 +84,7 @@ export default class MergeDectorator implements vscode.Disposable { outlineWidth: '1pt', outlineColor: new vscode.ThemeColor('merge.border'), after: { - contentText: ' ' + localize('currentChange', '(Current change)'), + contentText: ' ' + localize('currentChange', '(Current Change)'), color: new vscode.ThemeColor('descriptionForeground') } }); @@ -105,7 +105,7 @@ export default class MergeDectorator implements vscode.Disposable { outlineColor: new vscode.ThemeColor('merge.border'), isWholeLine: this.decorationUsesWholeLine, after: { - contentText: ' ' + localize('incomingChange', '(Incoming change)'), + contentText: ' ' + localize('incomingChange', '(Incoming Change)'), color: new vscode.ThemeColor('descriptionForeground') } }); -- GitLab