EA-37573 NPE
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Sat, 11 Aug 2012 09:04:56 +0000 (13:04 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Sat, 11 Aug 2012 09:04:56 +0000 (13:04 +0400)
commit1963183b818367b1a3500e9f4a408f6219e87d4c
treea5c122ec7a6fe3ba3962aff4dfcc832bd49e50fc
parent9b73a0cfe816905ff218dfaf03c860237d40b233
EA-37573 NPE
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java