1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java
index e76f2f061485..80efbd46f8fa 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,13 +58,13 @@ public class MergeAction extends AnAction {
 
       final VcsContext context = CvsContextWrapper.createCachedInstance(e);
       final VirtualFile[] files = context.getSelectedFiles();
-      if (files == null || files.length == 0) return;
+      if (files.length == 0) return;
+      final Project project = context.getProject();
       final ReadonlyStatusHandler.OperationStatus operationStatus =
-        ReadonlyStatusHandler.getInstance(context.getProject()).ensureFilesWritable(files);
+        ReadonlyStatusHandler.getInstance(project).ensureFilesWritable(files);
       if (operationStatus.hasReadonlyFiles()) {
         return;
       }
-      final Project project = context.getProject();
       AbstractVcsHelper.getInstance(project).showMergeDialog(Arrays.asList(files), new CvsMergeProvider());
     }
     catch (Exception e1) {