diff: add ToggleAutoScroll button to the merge window
authorAleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
Mon, 17 Feb 2014 15:33:19 +0000 (19:33 +0400)
committerAleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
Mon, 17 Feb 2014 15:34:02 +0000 (19:34 +0400)
commit7ebaa92ac3bcde92e315827bd8baa767fd3acd48
tree08bbf5577fdf847d3256f44b13c0007c036b73c8
parent721c13718e8e99bb3e05ebdf8c853b150e3cc7ce
diff: add ToggleAutoScroll button to the merge window
platform/platform-impl/src/com/intellij/openapi/diff/actions/ToggleAutoScrollAction.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java