diffcore-rename: properly honor the difference between -M and -C