Merge branch 'merge_tool_improving'
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Mon, 4 Jun 2012 10:48:12 +0000 (14:48 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Mon, 4 Jun 2012 10:48:12 +0000 (14:48 +0400)
1  2 
platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java