*.ipynb	diff=jupyternotebook

*.ipynb	merge=jupyternotebook