Models a merge conflict. More...
#include <string>
#include <toolexcept.hpp>
Models a merge conflict.