Elektra 0.11.0
|
Models a merge conflict. More...
Namespaces | |
namespace | kdb |
This is the main namespace for the C++ binding and libraries. | |
namespace | kdb::tools |
This namespace is for the libtool library. | |
Enumerations | |
enum | kdb::tools::merging::ConflictOperation { kdb::tools::merging::CONFLICT_ADD , CONFLICT_DELETE , CONFLICT_MODIFY , CONFLICT_META , CONFLICT_SAME } |
Models a merge conflict.