Code

add tests for merge-index / merge-one-file