diff --git a/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
index a638a87c2c6b..27cc88aa3fd6 100644
--- a/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+++ b/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
@@ -254,6 +254,7 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
   }
 
   private synchronized void resetTracker(final VirtualFile virtualFile) {
+    if (System.getProperty("idea.ignore.changemarkers") != null) return;
     final LvcsFile lvcsFile = LocalVcs.getInstance(getProject()).findFile(virtualFile.getPath());
     if (lvcsFile == null) return;