Merge remote-tracking branch 'origin/master'
[idea/community.git] / platform / vcs-impl / src / com / intellij / diff /
drwxr-xr-x   ..
-rw-r--r-- 2793 Block.java
-rw-r--r-- 1792 FileAwareSimpleContent.java
-rw-r--r-- 2151 FindBlock.java