DarkRadiant: master 8304beae
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
greebo | greebo | master | 26.02.2023 05:24 | master be71619d |
Affected Issues | 0006261: Three-way merge produces duplicate primitives when a func_static is moved | |||
Changeset | 0006261: Extend three way merge test maps with the problematic scenario | |||
mod - test/resources/tdm/maps/threeway_merge_base.mapx | Diff File | |||
mod - test/resources/tdm/maps/threeway_merge_source_1.mapx | Diff File | |||
mod - test/resources/tdm/maps/threeway_merge_target_1.mapx | Diff File |