[midPoint-git] [Evolveum/midpoint-studio] 8bf4f2: 3-way merge for initial objects ui prototype

[Viliam Repan]

  Branch: refs/heads/feature/merge
  Home:   https://github.com/Evolveum/midpoint-studio
  Commit: 8bf4f210e1c93af2b19217eae8cab389429dd662
      https://github.com/Evolveum/midpoint-studio/commit/8bf4f210e1c93af2b19217eae8cab389429dd662
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2024-03-19 (Tue, 19 Mar 2024)

  Changed paths:
    M studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/TestAction.java
    A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/DefaultTreeTableModel.java
    A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/DeltaTreeTable.java
    A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/DeltaTreeTableModel.java
    A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/InitialObjectDiffProcessor.java
    A studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/impl/diff/InitialObjectDiffRequest.java

  Log Message:
  -----------
  3-way merge for initial objects ui prototype



To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/midpoint-studio/settings/notifications