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)
commit8f620f11090f57bc3806443946c97ab57485f6d9
treeac38d3105bf4501f020625422fe9837f20f86aee
parent43b14bcad0237d3cdbfd21ebec19a2de256fd50f
parent107dcc9f6f87fe9c951562ddb8b39a0a014f447a
Merge branch 'merge_tool_improving'
platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java