From 3aef7bfeb7ea65dea27a692bb47d53652964f480 Mon Sep 17 00:00:00 2001
From: Olesya Smirnova <Olesya.Smirnova@jetbrains.com>
Date: Wed, 2 Mar 2005 21:08:27 +0300
Subject: [PATCH] http://www.intellij.net/tracker/idea/viewSCR?publicId=43994
 fixed

---
 .../intellij/openapi/vcs/actions/AbstractShowDiffAction.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/com/intellij/openapi/vcs/actions/AbstractShowDiffAction.java b/source/com/intellij/openapi/vcs/actions/AbstractShowDiffAction.java
index d5f4376fc78b..dfc94e848148 100644
--- a/source/com/intellij/openapi/vcs/actions/AbstractShowDiffAction.java
+++ b/source/com/intellij/openapi/vcs/actions/AbstractShowDiffAction.java
@@ -13,6 +13,7 @@ import com.intellij.openapi.vcs.diff.DiffProvider;
 import com.intellij.openapi.vcs.history.VcsFileContent;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.progress.ProcessCanceledException;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -116,6 +117,9 @@ public abstract class AbstractShowDiffAction extends AbstractVcsAction{
 
       DiffManager.getInstance().getDiffTool().show(request);
     }
+    catch (ProcessCanceledException e) {
+      //ignore
+    }
     catch (VcsException e) {
       AbstractVcsHelper.getInstance(project).showError(e, "Diff");
     }