From 15cad5b15b2a0e125a9cbb6e1b53a319c8a60a8b Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Tue, 18 Sep 2012 19:33:20 +0400
Subject: [PATCH] exception fixed

---
 .../vcs/changes/conflicts/ChangelistConflictTracker.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java
index 8666cc0a704a..21d6ce5205c6 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java
@@ -149,8 +149,7 @@ public class ChangelistConflictTracker {
   }
 
   private void checkOneFile(VirtualFile file, LocalChangeList defaultList) {
-    final LocalChangeList changeList = myChangeListManager.getChangeList(file);
-    if (file == null || Comparing.equal(changeList, defaultList) || ChangesUtil.isInternalOperation(file)) {
+    if (file == null || Comparing.equal(myChangeListManager.getChangeList(file), defaultList) || ChangesUtil.isInternalOperation(file)) {
       return;
     }