diff --git a/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
index 27cc88aa3fd6..59ff0237df96 100644
--- a/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+++ b/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
@@ -241,6 +241,7 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
 
 
   public LineStatusTracker setUpToDateContent(Document document, String lastUpToDateContent) {
+    if (System.getProperty("idea.ignore.changemarkers") != null) return null;
     LineStatusTracker result = myLineStatusTrackers.get(document);
     if (result == null) {
       result = LineStatusTracker.createOn(document, lastUpToDateContent, getProject());