MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

merge: enable "Resolve Conflict" gutter action

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-10-04 19:08:34 +03:00
parent 61de03f953
commit a477d89802
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/resources/misc/registry.properties
+1 -1
View File
@@ -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.