Integrated GoogleTest
Started refactoring the merge code (along with unit tests)
Completely reimplemented the merge algorithm
Implemented meta key comparison and cleaned up the tests
Wrote comments for the ThreeWayMerge functions
Fixed incorrect usage of delete
Registered the merge command, conflicts are now reported
Merge pull request #2 from fberlakovich/merging

Improvements to the merging code