mergeresult.hpp File Reference

Class modelling the result of a three way merge. More...

#include <kdb.hpp>
#include <merging/mergeconflict.hpp>

Include dependency graph for mergeresult.hpp:

This graph shows which files directly or indirectly include this file:

Namespaces
	kdb
	This is the main namespace for the C++ binding and libraries.
	kdb::tools
	This namespace is for the libtool library.

Detailed Description

Class modelling the result of a three way merge.

Copyright

BSD License (see doc/COPYING or http://www.libelektra.org)