Skip to content

Commit

Permalink
Fix cache GUI popup text (#1523)
Browse files Browse the repository at this point in the history
  • Loading branch information
andreeis authored Nov 5, 2020
1 parent 56f886b commit f188362
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/cache-view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit f188362

Please sign in to comment.