DarkRadiant: master e2fec672
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| greebo | greebo | master | 18.06.2021 12:13 | master 23cc9213 |
| Affected Issues | 0005643: Three-Way Map Merge | |||
| Changeset | 0005643: Add a ConflictType enum to be able to specifically tell what a conflict is about. Expand unit tests by some value change conflicts. |
|||
| mod - include/imapmerge.h | Diff File | |||
| mod - libs/scene/merge/MergeAction.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 | |||
| mod - test/resources/tdm/maps/threeway_merge_source_2.mapx | Diff File | |||
| mod - test/resources/tdm/maps/threeway_merge_target_2.mapx | Diff File | |||
