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 incorrect usages of meta deletion
Fixed the include guard of automergestrategy.hpp
Fixed a bug in the metamergestrategy
Added TODOs for missing testcases
The merge command now understands a commandline option for specifying the strategies to use
Merge pull request #4 from fberlakovich/merging

Updated merge code