Merge branch 'master' into new-merge

# Conflicts:
#	platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java
#	platform/util/resources/misc/registry.properties

diff --cc platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
Simple merge

diff --cc platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java
index 3de0f5264cd756de99df45507d6478500d4508e7,b2770697660b68b8d3e74f66f76fe121a970d7c8..87b8f6ab111d472642169fb1a3f4e4326deea539
--- 1/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java
--- 2/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java
@@@ -31,11 -30,12 +30,11 @@@ import com.intellij.diff.tools.util.bas
  import com.intellij.diff.tools.util.side.TwosideTextDiffViewer;
  import com.intellij.diff.util.*;
  import com.intellij.diff.util.DiffUserDataKeysEx.ScrollToPolicy;
- import com.intellij.diff.util.DiffUtil.DocumentData;
 +import com.intellij.icons.AllIcons;
  import com.intellij.openapi.Disposable;
 -import com.intellij.openapi.actionSystem.AnAction;
 -import com.intellij.openapi.actionSystem.CommonDataKeys;
 -import com.intellij.openapi.actionSystem.Separator;
 +import com.intellij.openapi.actionSystem.*;
  import com.intellij.openapi.application.ApplicationManager;
+ import com.intellij.openapi.command.undo.UndoManager;
  import com.intellij.openapi.diagnostic.Logger;
  import com.intellij.openapi.diff.LineTokenizer;
  import com.intellij.openapi.editor.*;

diff --cc platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java
index deb7f05bacd90243bee9ca6a7bbb10cbc7d70aa9,4781f04737c1bad345105ab370f5bec719dfd153..a2d0a598e95302815049f9a7f89d8ff731832556
--- 1/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java
--- 2/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java
@@@ -28,10 -28,12 +28,9 @@@ import com.intellij.diff.tools.util.bas
  import com.intellij.diff.tools.util.side.TwosideTextDiffViewer;
  import com.intellij.diff.util.*;
  import com.intellij.diff.util.DiffUserDataKeysEx.ScrollToPolicy;
- import com.intellij.diff.util.DiffUtil.DocumentData;
  import com.intellij.icons.AllIcons;
  import com.intellij.openapi.Disposable;
 -import com.intellij.openapi.actionSystem.AnAction;
 -import com.intellij.openapi.actionSystem.AnActionEvent;
 -import com.intellij.openapi.actionSystem.CommonDataKeys;
 -import com.intellij.openapi.actionSystem.Separator;
 +import com.intellij.openapi.actionSystem.*;
  import com.intellij.openapi.application.ApplicationManager;
  import com.intellij.openapi.diagnostic.Logger;
  import com.intellij.openapi.diff.DiffNavigationContext;

diff --cc platform/diff-impl/src/com/intellij/diff/tools/util/side/TwosideTextDiffViewer.java
Simple merge

diff --cc platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
Simple merge

diff --cc platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
Simple merge

diff --cc platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
Simple merge

diff --cc platform/platform-resources/src/META-INF/PlatformExtensions.xml
Simple merge

diff --cc platform/platform-resources/src/idea/PlatformActions.xml
Simple merge

diff --cc platform/util/resources/misc/registry.properties
index a2722c28254d3ffa3d8f8b610cce1fe9acb067f7,5affd420ca95746af742c1cb9813e465700b3522..d7a5a946fbf1f45fca8e532c9099af0a1e14f5cc
--- 1/platform/util/resources/misc/registry.properties
--- 2/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@@ -398,7 -396,7 +396,8 @@@ diff.maximum.line.word.attempt.descript
  diff.maximum.line.word.attempt.restartRequired=true
  diff.divider.repainting.fix=true
  diff.divider.repainting.disable.blitting=true
+ diff.show.old.diff.action.enabled=false
 +diff.merge.conflict.two.step.resolve=true
  
  search.everywhere.toolwindows=true
  search.everywhere.files=true