From 7e1f8d6788c75b8105be3a3a8ea2cacf99ac6269 Mon Sep 17 00:00:00 2001 From: "Dmitry.Krasilschikov" Date: Mon, 13 Jan 2020 23:17:55 +0200 Subject: [PATCH] escape ampersand in properties file GitOrigin-RevId: c254ecae3f170db09627eaf621ff5511198944b4 --- .../platform-resources-en/src/messages/DiffBundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-resources-en/src/messages/DiffBundle.properties b/platform/platform-resources-en/src/messages/DiffBundle.properties index 7ea12c162a59..ee6f24297982 100644 --- a/platform/platform-resources-en/src/messages/DiffBundle.properties +++ b/platform/platform-resources-en/src/messages/DiffBundle.properties @@ -108,5 +108,5 @@ merge.version.title.their.with.revision=Changes from server (revision {0}) merge.version.title.base=Base version merge.version.title.merged=Merged version merge.version.title.merged.result=Result -configurable.DiffSettingsConfigurable.display.name=Diff & Merge +configurable.DiffSettingsConfigurable.display.name=Diff \\& Merge configurable.ExternalDiffSettingsConfigurable.display.name=External Diff Tools