Rename current CDiff to CDiffTest
Add loading of merge base to FilePersistence::Merge