the first think you need ot deermin is what files you changed originally

thats why you do a winmerge on a coreset of files from your original install

this will give you the list of files that you have changed

Now you can compare that with a fresh 1.3.9 install and you will now have a short list of files that need to be compared and merged