| Author |
Committer |
Branch |
Timestamp |
Parent |
| greebo |
greebo |
master |
15.06.2021 08:10 |
master 33d28ff9 |
|
|
Affected Issues |
0005643: Three-Way Map Merge |
|
|
Changeset |
0005643: Start setting up the unit tests for the three-way merge scenario |
| mod - libs/scene/merge/MergeOperationBase.cpp |
Diff
File |
| mod - libs/scene/merge/MergeOperationBase.h |
Diff
File |
| mod - libs/scene/merge/ThreeWayMergeOperation.cpp |
Diff
File |
| mod - libs/scene/merge/ThreeWayMergeOperation.h |
Diff
File |
| mod - test/MapMerging.cpp |
Diff
File |
| add - test/resources/tdm/maps/threeway_merge_base.mapx |
Diff
File |
| add - test/resources/tdm/maps/threeway_merge_source_1.mapx |
Diff
File |
| add - test/resources/tdm/maps/threeway_merge_target_1.mapx |
Diff
File |
