From a477d898022089acbe5ca446f1eb49c94299e268 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 4 Oct 2016 19:03:48 +0300 Subject: [PATCH] merge: enable "Resolve Conflict" gutter action --- platform/util/resources/misc/registry.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 1e14e6c929ee..03d437856f27 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -489,7 +489,7 @@ diff.maximum.changes.array.size=10000000 diff.maximum.changes.array.size.restartRequired=true 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=false +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.enable.psi.highlighting=true diff.enable.psi.highlighting.description=Enable advanced highlighting and code navigation in VCS content in diff viewers.