[midPoint-git] [Evolveum/midpoint] e9b808: Support for situation in object merge (MID-3460)

[Radovan Semancik]

  Branch: refs/heads/support-3.4
  Home:   https://github.com/Evolveum/midpoint
  Commit: e9b80820b0bba063553320c911b71bda6d1d098c
      https://github.com/Evolveum/midpoint/commit/e9b80820b0bba063553320c911b71bda6d1d098c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-10-28 (Fri, 28 Oct 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMerge.java
    M model/model-intest/src/test/resources/common/system-configuration.xml

  Log Message:
  -----------
  Support for situation in object merge (MID-3460)