This week's book giveaway is in the OCAJP 8 forum. We're giving away four copies of OCA Java SE 8 Programmer I Study Guide and have Edward Finegan & Robert Liguori on-line! See this thread for details.
Frank, there is a description of how to compare and I guess to some extent merge the the two files, in the help files of Eclipse 2.1 I read it under Workbench User Guide -> Getting Started -> Basic Tutorial -> Comparing -> Working with the comparison (here it explains how you can copy one line from one file to the other or copy the whole of one to the other or merge them). I hope this helps.
The secret to creativity is knowing how to hide your sources.