Updated merge tutorial with requested changes and fixes to the examples.
Fixed typos
Fixed a subtle bug in the metamergestrategy causing value loss on a META<->META conflict
Added testvalues for ini
Added new simple strategies for modeling the existing import strategies
Changed the threewaymerge to also merge the parentkey
Changed the import command to use the merging framework #48, #52
elektra-merge-integration document
Remove part about umount
Write example text and fix last commit
Fix typos
Spelling mistakes and updated
Changed commands
Improved the help text of import
Fixed a merge conflict presentation bug
Fixed incorrect use of single line if
Fixed a critical bug in import and reenabled previously failing tests
Fixed a wrong return value in case of a merge conflict
Added testvalues for ini
Another try to fix the cut issue