Source code merge program

A good source code merge program is different from a basic text merge program.  A source code merge program needs to understand that it is computer code it's merging.

This affects how the merge program's behaviour when it comes to:

• Code blocks
• comment blocks
• Refactoring
• File headers
• Indentation
• Matching brackets }

jliu