[midPoint-git] [Evolveum/midpoint] 1336bd: Identity merge, second step (MID-3460)

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 1336bd75c6ba6ae7f6a2435c3a260dc26428ea2b
      https://github.com/Evolveum/midpoint/commit/1336bd75c6ba6ae7f6a2435c3a260dc26428ea2b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    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
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Identity merge, second step (MID-3460)