Funny. I was just about to recommend TortoiseMerge.
A good diff tool in windows
Miscellaneous Forums/General Discussion/A good diff tool in windowsThe 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.