don't include the non-conflict files that CVS leaves behind in the build tree
while (dp = readdir (df)) {
if (dp->d_name[strlen(dp->d_name) - 1] == '~')
continue;
while (dp = readdir (df)) {
if (dp->d_name[strlen(dp->d_name) - 1] == '~')
continue;
+ if (dp->d_name[0] == '.' && dp->d_name[1] == '#') /* 'non-conflict files' left behind by CVS */
+ continue;
strcpy (p, dp->d_name);
if (n_dirs > 0) {
strcpy (p, dp->d_name);
if (n_dirs > 0) {