Implementation of MergeConflictStrategy. More...
#include <merging/mergeconflictstrategy.hpp>
#include <string>
Implementation of MergeConflictStrategy.