diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/FrameDiffTool.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/FrameDiffTool.java index d3f226decfe5..477835c682a2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/FrameDiffTool.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/FrameDiffTool.java @@ -197,10 +197,8 @@ public class FrameDiffTool implements DiffTool { String message = Arrays.equals(bytes1, bytes2) ? DiffBundle.message("diff.contents.are.identical.message.text") : DiffBundle.message("diff.contents.have.differences.only.in.line.separators.message.text"); - Messages.showInfoMessage(data.getProject(), message, DiffBundle.message("no.differences.dialog.title")); - return false; - //return Messages.showDialog(data.getProject(), message + "\nShow diff anyway?", "No Differences", new String[]{"Yes", "No"}, 1, - // Messages.getQuestionIcon()) == 0; + return Messages.showYesNoDialog(data.getProject(), message + "\n" + DiffBundle.message("show.diff.anyway.dialog.message"), + DiffBundle.message("no.differences.dialog.title"), Messages.getQuestionIcon()) == Messages.YES; } public boolean canShow(DiffRequest data) { diff --git a/platform/platform-resources-en/src/messages/DiffBundle.properties b/platform/platform-resources-en/src/messages/DiffBundle.properties index e604d4fa37de..4b46af689579 100644 --- a/platform/platform-resources-en/src/messages/DiffBundle.properties +++ b/platform/platform-resources-en/src/messages/DiffBundle.properties @@ -54,6 +54,7 @@ select.external.diff.program.dialog.title=Select External Diff Program diff.contents.are.identical.message.text=Contents are identical diff.contents.have.differences.only.in.line.separators.message.text=Contents have differences only in line separators diff.contents.have.differences.only.in.line.separators.or.whitespaces=Contents have differences only in line separators or whitespaces +show.diff.anyway.dialog.message=Show diff anyway? no.differences.dialog.title=No Differences merge.dialog.apply.change.action.name=Apply change merge.dialog.ignore.change.action.name=Ignore change