From ab415d506ec876c7ac2e0904431af5219d394efc Mon Sep 17 00:00:00 2001 From: Radu Nedelcu Date: Mon, 16 Feb 2026 14:56:21 +0200 Subject: [PATCH] typo [vcs-merge]: Proper text for merge dialog (IJPL-175152) GitOrigin-RevId: 089af0bb516b16f591ca673d50cd208d6f708e00 --- platform/diff-api/resources/messages/DiffBundle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/diff-api/resources/messages/DiffBundle.properties b/platform/diff-api/resources/messages/DiffBundle.properties index a762313866de..94b1020f03ab 100644 --- a/platform/diff-api/resources/messages/DiffBundle.properties +++ b/platform/diff-api/resources/messages/DiffBundle.properties @@ -61,8 +61,8 @@ merge.dialog.accept.change.command=Accept change merge.dialog.ignore.change.command=Ignore change merge.dialog.reset.change.command=Reset resolved change merge.dialog.resolve.conflict.command=Resolve conflict -merge.dialog.apply.non.conflicted.changes.command=Apply non conflicted changes -merge.dialog.ignore.all.changes=Apply non conflicted changes +merge.dialog.apply.non.conflicted.changes.command=Apply non-conflicting changes +merge.dialog.ignore.all.changes=Apply non-conflicting changes patch.dialog.copy.change.command=Copy to clipboard patch.dialog.copy.change.command.balloon=Copied to clipboard # suppress inspection "UnusedProperty": used by 3-party plugins