| Author |
Committer |
Branch |
Timestamp |
Parent |
| greebo |
greebo |
master |
03.07.2021 05:41 |
master 2ee17a8c |
|
|
Affected Issues |
0005643: Three-Way Map Merge |
|
|
Changeset |
0005643: Extend IConflictResolutionAction to be able to access both (source and target) entities. |
| mod - include/imapmerge.h |
Diff
File |
| mod - libs/scene/merge/MergeAction.h |
Diff
File |
| mod - libs/scene/merge/MergeLib.h |
Diff
File |
| mod - libs/scene/merge/ThreeWayMergeOperation.cpp |
Diff
File |
| mod - radiant/ui/merge/MergeControlDialog.cpp |
Diff
File |
| mod - test/MapMerging.cpp |
Diff
File |
