diff: add annotate action to diff viewers
[idea/community.git] / platform / diff-impl / src / com / intellij / diff / merge /
drwxr-xr-x   ..
-rw-r--r-- 5522 BinaryMergeTool.java
-rw-r--r-- 2662 ErrorMergeTool.java
-rw-r--r-- 13398 MergeRequestProcessor.java
-rw-r--r-- 3428 MergeUtil.java
-rw-r--r-- 4964 MergeWindow.java
-rw-r--r-- 14191 TextMergeChange.java
-rw-r--r-- 46880 TextMergeTool.java