Merge a master repository into the current repository, relegating the current repository's files to a subdirectory.
Ignore swap files.