nbdime
$ pip install nbdime
$ nbdime config-git --enable --global
これでdiffがいい感じになる
globalのgitconfigにこれが追記される
code:.gitconfig
command = git-nbdiffdriver diff
driver = git-nbmergedriver merge %O %A %B %L %P
name = jupyter notebook merge driver
cmd = git-nbdifftool diff \"$LOCAL\" \"$REMOTE\" \"$BASE\"
prompt = false
cmd = git-nbmergetool merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
prompt = false
$ python -m pip install nbdime
$ python -m nbdime config-git --enable --global