Skip to content

Commit b10ca0e

Browse files
committed
Tweaks checkbox tooltip.
1 parent 1d6b9d6 commit b10ca0e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ export class MergeConflictGutterItemView extends Disposable implements IGutterIt
238238

239239
target.classList.add('merge-accept-gutter-marker');
240240

241-
const checkBox = new Toggle({ isChecked: false, title: localize('acceptMerge', "Accept Merge"), icon: Codicon.check });
241+
const checkBox = new Toggle({ isChecked: false, title: localize('accept', "Accept"), icon: Codicon.check });
242242
this._register(
243243
dom.addDisposableListener(checkBox.domNode, dom.EventType.MOUSE_DOWN, (e) => {
244244
if (e.button === 2) {

0 commit comments

Comments
 (0)