diff --git a/extensions/merge-conflict/src/mergeDecorator.ts b/extensions/merge-conflict/src/mergeDecorator.ts index 868f383f5d87cb6ebe3d3ad3b4973406626ae55a..19429fc2385f21cd8d120bec12e43f3411d90c4e 100644 --- a/extensions/merge-conflict/src/mergeDecorator.ts +++ b/extensions/merge-conflict/src/mergeDecorator.ts @@ -146,7 +146,7 @@ export default class MergeDectorator implements vscode.Disposable { return; } - // If we have a pending scan from the same origin, exit early. + // If we have a pending scan from the same origin, exit early. (Cannot use this.tracker.isPending() because decorations are per editor.) if (this.updating.get(editor)) { return; }