Merge remote-tracking branch 'origin/master'

[idea/community.git] / platform / util / resources / misc / registry.properties

diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index b87428ba92a030252f3e8c1249d5b34b6e678c6d..d54c2328536c62790cbfb9d9ab00e06f885cd77a 100644 (file)
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -491,6 +491,8 @@ diff.divider.repainting.disable.blitting=true
 diff.divider.repainting.disable.blitting.description=Fix painting glitch on scrolling in diff - disable BLIT_SCROLL_MODE to force repainting with RepaintManager
 diff.merge.resolve.conflict.action.visible=true
 diff.merge.resolve.conflict.action.visible.description=Allows to resolve some conflict in merge in one click (with a high probability of wrong result)
 diff.divider.repainting.disable.blitting.description=Fix painting glitch on scrolling in diff - disable BLIT_SCROLL_MODE to force repainting with RepaintManager
 diff.merge.resolve.conflict.action.visible=true
 diff.merge.resolve.conflict.action.visible.description=Allows to resolve some conflict in merge in one click (with a high probability of wrong result)

+diff.merge.resolve.conflict.action.use.greedy.approach=false
+diff.merge.resolve.conflict.action.use.greedy.approach.description=Use greedy heuristic in attempt to resolve conflict. This leads to higher amounts of false-positive and true-positive results.

 diff.enable.psi.highlighting=true
 diff.enable.psi.highlighting.description=Enable advanced highlighting and code navigation in VCS content in diff viewers.
 diff.pass.rich.editor.context=false
 diff.enable.psi.highlighting=true
 diff.enable.psi.highlighting.description=Enable advanced highlighting and code navigation in VCS content in diff viewers.
 diff.pass.rich.editor.context=false