aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitattributes8
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
index 7d3af019..d9d28210 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,6 @@
-*.ipynb diff=ipynb
-*.ipynb filter=nbstripout
+#*.ipynb diff=ipynb
+#*.ipynb filter=nbstripout
+
+*.ipynb diff=jupyternotebook
+
+*.ipynb merge=jupyternotebook