From f2ee9951c18fe7d5830642f9e3eb10e1b1c35fc9 Mon Sep 17 00:00:00 2001 From: Bogdan Kirilenko Date: Mon, 18 Dec 2023 14:36:43 +0100 Subject: [PATCH] [jupyter] PY-20132 activate jupyter diff feature in PyCharm Pro GitOrigin-RevId: 9579a62aa655609b1a4cbb4da4462fe883cc377d --- platform/util/resources/misc/registry.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 6631a94666f0..f2c1404f2c4b 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -1171,6 +1171,7 @@ diff.use.aggressive.text.file.detection=false diff.use.aggressive.text.file.detection.description=Ignore IDE 'File Types' setting when trying to show files in a diff viewer. jupyter.diff.viewer=true +jupyter.diff.viewer.output=false jupyter.diff.viewer.description=Implementation of diff tool for Jupyter Notebooks, which instead of diff for JSON shows a diff for notebook representations jupyter.merge.viewer=true jupyter.merge.viewer.description=Implementation of merge tool for Jupyter Notebooks, which helps to deal with conflicts during git activities