merge-recursive: fix the refresh logic in update_file_flags