fix to checkrepo to not delete new files on long merges