Change test scripts to add more than one test notebook per repository

* `make_diff.py` and `make_merge_conflict.py` now create test repositories like before, but add more than one file for testing purposes
* reorganized test notebook files
* `make_merge_conflict.py` now accepts a `--mercurial` flag which creates a mercurial test repository instead of a git test repository.