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

[jupyter] PY-20132 activate jupyter diff feature in PyCharm Pro

Browse Source 
GitOrigin-RevId: 9579a62aa655609b1a4cbb4da4462fe883cc377d
This commit is contained in:
Bogdan Kirilenko
2023-12-19 13:28:23 +00:00
committed by intellij-monorepo-bot
parent 0a12d050e6
commit f2ee9951c1
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/resources/misc/registry.properties
+1
View File
@@ -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