Merge support in SimpleDiff.pas.
New demo for diff merging (it adds the differences to the left source).
Authored by: outchy 2010-12-21
Parent: [r22]
Child: [r24]