mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
This commit is contained in:
@@ -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");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user