merge-recursive: move current_{file,directory}_set to struct merge_options