Use Winmerge. Its a great tool to merge sources. (I use it as part of TortoiseCVS)
Merging source
Miscellaneous Forums/General Discussion/Merging sourceThe forum is locked. These are the original blitzbasic.com forums, kept so they can still be read. No new topics, replies or edits can be made here. To join in, head over to the Blitz3D+ forums.