Integrated GoogleTest
Started refactoring mergecode.
Reimplimented the merge algorithm
Implemented meta key comparison and cleaned up the tests
Registered the merge command, conflicts are now reported.
Wrote comments for the ThreeWayMerge functions
Fixed incorrect usage of delete
Extracted helper functions to own files and namespaces
Refactored the merger to support strategies, extracted existing functionality into a strategy and refactored
Implemented a strategy for merging metakeys and refactored
Fixed a shadow warning
Fixed a return-type warning
Improved the usability of the merge command
Fixed the merge algorithm to no longer compare parent keys and
changed the tests to avoid indexes (fragile test smell)
Fixed a conflict resolution bug
Implemented an interactive merge strategy
Added a c++ meta delete method #8
Fixed the include guard of automergestrategy.hpp
Fixed incorrect usages of meta deletion
Fixed a bug in the metamergestrategy