* Make merge * Avoid a newline at each run of merge.py.
* Make merge * Move merge to its own script. * No longer needed. * Use git ls-files.