From f1883628c1f59e0a872e0aeb645fda031ef5d666 Mon Sep 17 00:00:00 2001
From: Andreea Isac <48239328+andreeis@users.noreply.github.com>
Date: Thu, 5 Nov 2020 13:48:23 -0800
Subject: [PATCH] Fix cache GUI popup text (#1523)

---
 src/cache-view.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cache-view.ts b/src/cache-view.ts
index c8602911e..a67a334e8 100644
--- a/src/cache-view.ts
+++ b/src/cache-view.ts
@@ -130,9 +130,10 @@ export class ConfigurationWebview {
       const fromCache = localize('from.cache', 'From Cache');
       if (conflictsExist) {
         result = await vscode.window.showWarningMessage(
-          localize('merge.cache.edits', "The CMake cache has been modified outside this webview \
-                                         and there are conflicts with the current unsaved edits. \
-                                         Which values do you want to keep?"), ignore, fromCache, fromUI);
+          localize('merge.cache.edits', "The CMake cache has been modified outside this webview and there are conflicts with the current unsaved edits. Which values do you want to keep?"),
+          ignore,
+          fromCache,
+          fromUI);
         if (result === fromUI) {
           this._options = mergedOptions;
           await this.persistCacheEntries();