CONTRIBUTING.md
LICENSE.md
MANIFEST.in
README.md
conftest.py
lerna.json
package.json
pytest.ini
setup.cfg
setup.py
setupbase.py
tsconfig.json
tsconfig_base.json
docs/Makefile
docs/doc-requirements.txt
docs/make.bat
docs/source/changelog.md
docs/source/cli.rst
docs/source/conf.py
docs/source/config.rst
docs/source/diffing.rst
docs/source/extensions.rst
docs/source/glossary.rst
docs/source/index.rst
docs/source/installing.rst
docs/source/merging.rst
docs/source/nodevenv.rst
docs/source/restapi.rst
docs/source/testing.rst
docs/source/usecases.rst
docs/source/vcs.rst
docs/source/images/diff-bad-shortened.png
docs/source/images/diff-bad.png
docs/source/images/nbdiff-terminal.png
docs/source/images/nbdiff-web.png
docs/source/images/nbext-preview.png
docs/source/images/nbmerge-terminal.png
docs/source/images/nbmerge-web.png
docs/source/images/nbshow.png
jupyter-config/jupyter_notebook_config.d/nbdime.json
jupyter-config/nbconfig/notebook.d/nbdime.json
nbdime/__init__.py
nbdime/__main__.py
nbdime/_version.py
nbdime/args.py
nbdime/config.py
nbdime/diff_format.py
nbdime/diff_format.schema.json
nbdime/diff_utils.py
nbdime/gitfiles.py
nbdime/ignorables.py
nbdime/log.py
nbdime/merge_format.schema.json
nbdime/nbdiffapp.py
nbdime/nbmergeapp.py
nbdime/nbpatchapp.py
nbdime/nbshowapp.py
nbdime/patching.py
nbdime/prettyprint.py
nbdime/profiling.py
nbdime/utils.py
nbdime.egg-info/PKG-INFO
nbdime.egg-info/SOURCES.txt
nbdime.egg-info/dependency_links.txt
nbdime.egg-info/entry_points.txt
nbdime.egg-info/requires.txt
nbdime.egg-info/top_level.txt
nbdime/diffing/__init__.py
nbdime/diffing/directorydiff.py
nbdime/diffing/generic.py
nbdime/diffing/lcs.py
nbdime/diffing/notebooks.py
nbdime/diffing/seq_bruteforce.py
nbdime/diffing/seq_difflib.py
nbdime/diffing/seq_myers.py
nbdime/diffing/sequences.py
nbdime/diffing/snakes.py
nbdime/merging/__init__.py
nbdime/merging/autoresolve.py
nbdime/merging/chunks.py
nbdime/merging/decisions.py
nbdime/merging/generic.py
nbdime/merging/notebooks.py
nbdime/merging/strategies.py
nbdime/notebook_ext/index.js
nbdime/tests/__init__.py
nbdime/tests/conftest.py
nbdime/tests/test_apply_merge.py
nbdime/tests/test_args.py
nbdime/tests/test_autoresolve.py
nbdime/tests/test_cli_apps.py
nbdime/tests/test_decision_tools.py
nbdime/tests/test_diff.py
nbdime/tests/test_diff_format.py
nbdime/tests/test_diff_gitrefs.py
nbdime/tests/test_diff_json_conversion.py
nbdime/tests/test_diff_performance.py
nbdime/tests/test_diff_sequence.py
nbdime/tests/test_diff_sequence_bruteforce.py
nbdime/tests/test_diff_sequence_difflib.py
nbdime/tests/test_directory_differ.py
nbdime/tests/test_git_diffdriver.py
nbdime/tests/test_git_filter_integration.py
nbdime/tests/test_hg_differ.py
nbdime/tests/test_js_artifacts_installed.py
nbdime/tests/test_merge.py
nbdime/tests/test_merge_format.py
nbdime/tests/test_merge_notebooks.py
nbdime/tests/test_merge_notebooks_inline.py
nbdime/tests/test_myers.py
nbdime/tests/test_notebook_diff.py
nbdime/tests/test_package.py
nbdime/tests/test_patch.py
nbdime/tests/test_prettyprint.py
nbdime/tests/test_server_extension.py
nbdime/tests/test_utils.py
nbdime/tests/test_web.py
nbdime/tests/utils.py
nbdime/tests/files/apap--1.ipynb
nbdime/tests/files/apap--2.ipynb
nbdime/tests/files/apap--3.ipynb
nbdime/tests/files/apap.ipynb
nbdime/tests/files/attachment--change_attachment.ipynb
nbdime/tests/files/attachment--empty_attachments_list.ipynb
nbdime/tests/files/attachment--remove_attachment.ipynb
nbdime/tests/files/attachment.ipynb
nbdime/tests/files/empty.ipynb
nbdime/tests/files/error--1.ipynb
nbdime/tests/files/error--2.ipynb
nbdime/tests/files/foo--1.ipynb
nbdime/tests/files/foo--2.ipynb
nbdime/tests/files/inline-conflict--1.ipynb
nbdime/tests/files/inline-conflict--2.ipynb
nbdime/tests/files/inline-conflict--3.ipynb
nbdime/tests/files/markdown-only--1.ipynb
nbdime/tests/files/markdown-only--2.ipynb
nbdime/tests/files/mixed-conflicts--1.ipynb
nbdime/tests/files/mixed-conflicts--2.ipynb
nbdime/tests/files/mixed-conflicts--3.ipynb
nbdime/tests/files/multi_cell_nb--cellchange.ipynb
nbdime/tests/files/multi_cell_nb--local.ipynb
nbdime/tests/files/multi_cell_nb--remote.ipynb
nbdime/tests/files/multi_cell_nb.ipynb
nbdime/tests/files/multilevel-test-base-local-diff.json
nbdime/tests/files/multilevel-test-base.ipynb
nbdime/tests/files/multilevel-test-local.ipynb
nbdime/tests/files/multilevel-test-merged.ipynb
nbdime/tests/files/multilevel-test-remote.ipynb
nbdime/tests/files/output-conflict--1.ipynb
nbdime/tests/files/output-conflict--2.ipynb
nbdime/tests/files/output-conflict--3.ipynb
nbdime/tests/files/single_cell_nb--changed_ec.ipynb
nbdime/tests/files/single_cell_nb--changed_metadata.ipynb
nbdime/tests/files/single_cell_nb--changed_output.ipynb
nbdime/tests/files/single_cell_nb--changed_source.ipynb
nbdime/tests/files/single_cell_nb--changed_source_output.ipynb
nbdime/tests/files/single_cell_nb--changed_source_output_ec.ipynb
nbdime/tests/files/single_cell_nb--json_output.ipynb
nbdime/tests/files/single_cell_nb--json_output_changed.ipynb
nbdime/tests/files/single_cell_nb.ipynb
nbdime/tests/files/source-conflict--1.ipynb
nbdime/tests/files/source-conflict--2.ipynb
nbdime/tests/files/source-conflict--3.ipynb
nbdime/tests/files/src-and-output--1.ipynb
nbdime/tests/files/src-and-output--2.ipynb
nbdime/tests/files/test-data-singlecell--1.ipynb
nbdime/tests/files/test-data-singlecell--2.ipynb
nbdime/tests/files/unicode--1.ipynb
nbdime/tests/files/unicode--2.ipynb
nbdime/tests/filters/add_helper.py
nbdime/tests/filters/noop.py
nbdime/tests/filters/strip_outputs.py
nbdime/vcs/__init__.py
nbdime/vcs/git/__init__.py
nbdime/vcs/git/diffdriver.py
nbdime/vcs/git/difftool.py
nbdime/vcs/git/filter_integration.py
nbdime/vcs/git/mergedriver.py
nbdime/vcs/git/mergetool.py
nbdime/vcs/hg/__init__.py
nbdime/vcs/hg/diff.py
nbdime/vcs/hg/diffweb.py
nbdime/vcs/hg/merge.py
nbdime/vcs/hg/mergeweb.py
nbdime/webapp/__init__.py
nbdime/webapp/nb_server_extension.py
nbdime/webapp/nbdifftool.py
nbdime/webapp/nbdiffweb.py
nbdime/webapp/nbdimeserver.py
nbdime/webapp/nbmergetool.py
nbdime/webapp/nbmergeweb.py
nbdime/webapp/webutil.py
nbdime/webapp/static/1.nbdime.js
nbdime/webapp/static/1.nbdime.js.map
nbdime/webapp/static/2.nbdime.js
nbdime/webapp/static/2.nbdime.js.map
nbdime/webapp/static/favicon.ico
nbdime/webapp/static/nbdime.js
nbdime/webapp/static/nbdime.js.map
nbdime/webapp/templates/compare.html
nbdime/webapp/templates/diff.html
nbdime/webapp/templates/difftool.html
nbdime/webapp/templates/merge.html
nbdime/webapp/templates/mergetool.html
nbdime/webapp/templates/nbdimepage.html
nbdime/webapp/testnotebooks/base.ipynb
nbdime/webapp/testnotebooks/cellchange.ipynb
nbdime/webapp/testnotebooks/local.ipynb
nbdime/webapp/testnotebooks/remote.ipynb
nbdime/webapp/testnotebooks/scrollA.ipynb
nbdime/webapp/testnotebooks/scrollB.ipynb
packages/labextension/package.json
packages/labextension/tsconfig.json
packages/labextension/dist/nbdime-jupyterlab-0.6.0.tgz
packages/labextension/schema/plugin.json
packages/labextension/src/actions.ts
packages/labextension/src/index.ts
packages/labextension/src/plugin.ts
packages/labextension/src/utils.ts
packages/labextension/src/widget.ts
packages/labextension/style/index.css
packages/nbdime/.npmignore
packages/nbdime/package.json
packages/nbdime/tsconfig.json
packages/nbdime/tslint.json
packages/nbdime/scripts/copy-files.js
packages/nbdime/src/typings.d.ts
packages/nbdime/src/chunking/decisionchunking.ts
packages/nbdime/src/chunking/diffchunking.ts
packages/nbdime/src/chunking/index.ts
packages/nbdime/src/common/collapsible.css
packages/nbdime/src/common/collapsiblepanel.ts
packages/nbdime/src/common/dragpanel.css
packages/nbdime/src/common/dragpanel.ts
packages/nbdime/src/common/editor.ts
packages/nbdime/src/common/exceptions.ts
packages/nbdime/src/common/mergeview.ts
packages/nbdime/src/common/util.ts
packages/nbdime/src/diff/diffentries.ts
packages/nbdime/src/diff/range.ts
packages/nbdime/src/diff/util.ts
packages/nbdime/src/diff/model/cell.ts
packages/nbdime/src/diff/model/common.ts
packages/nbdime/src/diff/model/immutable.ts
packages/nbdime/src/diff/model/index.ts
packages/nbdime/src/diff/model/notebook.ts
packages/nbdime/src/diff/model/output.ts
packages/nbdime/src/diff/model/renderable.ts
packages/nbdime/src/diff/model/string.ts
packages/nbdime/src/diff/widget/cell.ts
packages/nbdime/src/diff/widget/common.ts
packages/nbdime/src/diff/widget/index.ts
packages/nbdime/src/diff/widget/metadata.ts
packages/nbdime/src/diff/widget/notebook.ts
packages/nbdime/src/diff/widget/output.ts
packages/nbdime/src/diff/widget/renderable.ts
packages/nbdime/src/merge/decisions.ts
packages/nbdime/src/merge/model/cell.ts
packages/nbdime/src/merge/model/common.ts
packages/nbdime/src/merge/model/index.ts
packages/nbdime/src/merge/model/metadata.ts
packages/nbdime/src/merge/model/notebook.ts
packages/nbdime/src/merge/widget/cell.ts
packages/nbdime/src/merge/widget/common.ts
packages/nbdime/src/merge/widget/dragdrop.ts
packages/nbdime/src/merge/widget/index.ts
packages/nbdime/src/merge/widget/metadata.ts
packages/nbdime/src/merge/widget/notebook.ts
packages/nbdime/src/merge/widget/output.ts
packages/nbdime/src/patch/common.ts
packages/nbdime/src/patch/generic.ts
packages/nbdime/src/patch/index.ts
packages/nbdime/src/patch/stringified.ts
packages/nbdime/src/request/index.ts
packages/nbdime/src/styles/common.css
packages/nbdime/src/styles/diff.css
packages/nbdime/src/styles/merge.css
packages/nbdime/src/styles/variables.css
packages/nbdime/src/upstreaming/flexlayout.ts
packages/nbdime/src/upstreaming/flexpanel.css
packages/nbdime/src/upstreaming/flexpanel.ts
packages/nbdime/test/karma-nocov.conf.js
packages/nbdime/test/karma.conf.js
packages/nbdime/test/files/base.ipynb.json
packages/nbdime/test/files/decisionsA.json
packages/nbdime/test/src/tsconfig.json
packages/nbdime/test/src/typings.d.ts
packages/nbdime/test/src/common/collapsiblepanel.spec.ts
packages/nbdime/test/src/common/dragpanel.spec.ts
packages/nbdime/test/src/common/flexpanel.spec.ts
packages/nbdime/test/src/common/mergeview.spec.ts
packages/nbdime/test/src/common/util.spec.ts
packages/nbdime/test/src/diff/chunking.spec.ts
packages/nbdime/test/src/diff/model.spec.ts
packages/nbdime/test/src/diff/util.spec.ts
packages/nbdime/test/src/diff/widget/metadata.spec.ts
packages/nbdime/test/src/diff/widget/output.spec.ts
packages/nbdime/test/src/merge/decisions.spec.ts
packages/nbdime/test/src/merge/model.spec.ts
packages/nbdime/test/src/merge/widget.spec.ts
packages/nbdime/test/src/patch/patching.spec.ts
packages/nbdime/typings/codemirror-metamode.d.ts
packages/nbdime/typings/codemirror-runmode.d.ts
packages/nbdime/typings/codemirror.d.ts
packages/webapp/package.json
packages/webapp/tsconfig.json
packages/webapp/tslint.json
packages/webapp/webpack.config.js
packages/webapp/src/index.ts
packages/webapp/src/app/common.css
packages/webapp/src/app/common.ts
packages/webapp/src/app/compare.ts
packages/webapp/src/app/diff.css
packages/webapp/src/app/diff.ts
packages/webapp/src/app/merge.css
packages/webapp/src/app/merge.ts
packages/webapp/src/app/rendermime.ts
packages/webapp/src/app/res.ts
packages/webapp/src/app/save.ts
packages/webapp/src/app/staticdiff.ts