diff --git a/platform/platform-api/src/com/intellij/openapi/diff/ActionButtonPresentation.java b/platform/platform-api/src/com/intellij/openapi/diff/ActionButtonPresentation.java
index a8dbcdbc45e0..c4ae87fb1e02 100644
--- a/platform/platform-api/src/com/intellij/openapi/diff/ActionButtonPresentation.java
+++ b/platform/platform-api/src/com/intellij/openapi/diff/ActionButtonPresentation.java
@@ -29,7 +29,7 @@ public abstract class ActionButtonPresentation {
     }
   };
 
-  public static ActionButtonPresentation CANCEL_WITH_PROMPT = new ActionButtonPresentation(CommonBundle.getCancelButtonText()) {
+  public static ActionButtonPresentation CANCEL_WITH_PROMPT = new ActionButtonPresentation("Revert") {
     @Override
     public void run(DialogWrapper dialog) {
       if (Messages.showYesNoDialog(dialog.getRootPane(),
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtMergeFiles.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtMergeFiles.java
index 6d80a99e5b69..73e997036619 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtMergeFiles.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtMergeFiles.java
@@ -84,7 +84,7 @@ public class ExtMergeFiles extends BaseExternalTool {
 
       if (Messages.YES == Messages.showYesNoDialog(request.getProject(),
                                                    "Press \"Mark as Resolved\" when you finish resolving conflicts in the external tool",
-                                                   "Merge In External Tool", "Mark as Resolved", "Cancel", null)) {
+                                                   "Merge In External Tool", "Mark as Resolved", "Revert", null)) {
         result = DialogWrapper.OK_EXIT_CODE;
       }
       ((MergeRequestImpl)request).getResultContent().getFile().refresh(false, false);