Implemented notebook_merge()
Fix secret notebook problem (again).
Spaces instead of tabs in merge_script.js
Fix indents in merge_script.js
Get blob hashes from `git ls-files --unmerged` in the right order.
deepcopy cell objects in merge.py
Don't add an extra row for "unchanged" diffs.
Add comments explaining merge algorithm.
Handle git and mercurial mergetools
Add comments on git/hg usage
remove make_merge_conflict.py file
Partial python3 compatibility.
Error handling when given incorrect number of arguments.
Merge pull request #64 from tarmstrong/merge-prep-algorithm

Algorithm for preparing the merge
Merge branch 'master' into create-nbdiff-installer