MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

exception fixed

Browse Source
This commit is contained in:
Dmitry Avdeev
2012-09-18 19:33:20 +04:00
parent 3ace2764a3
commit 15cad5b15b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java
+1 -2
View File
@@ -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;
}