Elektra: merging Directory Reference

Elektra 0.8.24

merging Directory Reference

## Files
file | automergeconfiguration.hpp
| A configuration for a simple automerge.
file | automergestrategy.hpp
| A strategy for taking the value of.
file | importmergeconfiguration.hpp
| A configuration for a simple automerge and guaranteed conflict resolution by one side.
file | interactivemergestrategy.hpp
| Interactive merge strategy asking for user input at each step.
file | mergeconfiguration.hpp
| Base class for defining preconfigured merge configurations.
file | mergeconflict.hpp
| Models a merge conflict.
file | mergeconflictstrategy.hpp
| Interface for a MergeConflictStrategy.
file | mergeresult.hpp
| Class modelling the result of a three way merge.
file | mergetask.hpp
| Models a merge task.
file | mergingkdb.hpp
file | metamergestrategy.hpp
| Applies a MergeConflictStrategy on the metakeys.
file | newkeystrategy.hpp
| A strategy which always takes the value from one side.
file | onesidemergeconfiguration.hpp
| A configuration for a simple automerge and guaranteed conflict resolution by one side.
file | onesidestrategy.hpp
| A strategy which always takes the value from one side.
file | onesidevaluestrategy.hpp
file | overwritemergeconfiguration.hpp
| A configuration for a simple automerge and guaranteed conflict resolution by one side.
file | threewaymerge.hpp
| Implements a way to build and deal with a backend.