Minor Description
the naming convention for additional node type definitions in jackrabbit
includes the following rules:
- never use a reserved prefix/uri defined by the specification
- node type local name should start with uppercase.
i would therefore suggest to rename the mixin type defined by oak
to rep:MergeConflict as long as we don't have a specified, reserved
namespace definition for oak.