From c9aa3e5e79917e0966ca73538de7b009d1f8338b Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 12 May 2016 15:20:23 +0300 Subject: [PATCH] merge: fix capitalisation --- .../diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java index 5b5e1d98b805..79c1b64d3bfb 100644 --- a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java @@ -321,7 +321,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer { // we need invokeLater() here because viewer is partially-initialized (ex: there are no toolbar or status panel) // user can see this state while we're showing progress indicator, so we want let init() to finish. ApplicationManager.getApplication().invokeLater(() -> { - ProgressManager.getInstance().run(new Task.Modal(getProject(), "Computing differences...", true) { + ProgressManager.getInstance().run(new Task.Modal(getProject(), "Computing Differences...", true) { private Runnable myCallback; @Override