|
Elektra
0.9.10
|
Models a merge conflict. More...


Namespaces | |
| kdb | |
| This is the main namespace for the C++ binding and libraries. | |
| 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.