Merge branch 'diff'

diff --combined platform/platform-resources-en/src/misc/registry.properties
index 581374e2dd37e969c49660218cec21f5e56d5ed1,2be15a4a6775a8886c1daed861839a4c9b7e5070..fd9d8fc883a674d523f535e9bcbb0fbd1e9bd1e0
--- 1/platform/platform-resources-en/src/misc/registry.properties
--- 2/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@@ -328,6 -328,7 +328,7 @@@ junit_sm_runner=fals
  testng_sm_runner=false
  show.flex.debug.design.view=false
  git.new.log=true
+ diff.patience.alg=false
  
  svn.use.terminal=false
  
@@@ -335,13 -336,9 +336,13 @@@ completion.enable.relevant.method.chain
  ide.mac.message.sheets.java.emulation=false
  # suppress inspection "UnusedProperty"
  ide.mac.message.sheets.java.emulation.description=Use Java message sheets instead of native ones
 +ide.mac.message.sheets.java.emulation.dialogs=false
 +# suppress inspection "UnusedProperty"
 +ide.mac.message.sheets.java.emulation.dialogs.description=Use Java message sheets based on awt dialogs instead of native sheets
  linux.native.menu=false
  linux.native.menu.description=Enables native menu on Ubuntu
  windows.jumplist=true
 +# suppress inspection "UnusedProperty"
  windows.jumplist.description=Enables JumpLists on Windows
  
  # suppress inspection "UnusedProperty"