Implement merge-files only using @bukzor's method.  Still needs more tests.