@Melissa
Yes, that is the correct way of doing it. Glenn's changes are relatively minor and SNAF makes some more major changes so you want to merge his changes into SNAF. What you can do in this situation, although not always, is do one little block of modifications at a time. And check each time that the file is still running all right.
So, for instance, copy this lot into the file and check it works.
Code:
//gallery category test
$gallery_skips = 0; //flag for reducing # of columns
$not_gallery = 1;
if (ereg("(^23$|^23_)",$cPath)) { //this is a gallery category (replace 23 with your cat id)
$not_gallery = 0;
} // /gallery category test
So, you can kind of go step-by-step.
@Diva
You poor benighted windows users! You don't have Meld, do you?
http://meldmerge.org/ Free, like all linux stuff, and very very powerful :-) Three way comparisons. Directory comparisons. Version control. Mmmmmmm :-)