Merge branch 'diff'

[idea/community.git] / platform / platform-resources-en / src / misc / registry.properties

diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index 581374e2dd37e969c49660218cec21f5e56d5ed1..fd9d8fc883a674d523f535e9bcbb0fbd1e9bd1e0 100644 (file)
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -328,6 +328,7 @@ junit_sm_runner=false
 testng_sm_runner=false
 show.flex.debug.design.view=false
 git.new.log=true
+diff.patience.alg=false
 
 svn.use.terminal=false