Added Matt's --delete-excluded test for merge-file correctness.