|
file | automergestrategy.cpp |
| Implementation of AutoMergeStrategy.
|
|
file | interactivemergestrategy.cpp |
| Implementation of InteractiveMergeStrategy.
|
|
file | mergeconflictstrategy.cpp |
| Implementation of MergeConflictStrategy.
|
|
file | mergeresult.cpp |
| Implementation of MergeResult.
|
|
file | metamergestrategy.cpp |
| Implementation of MetaMergeStrategy.
|
|
file | newkeystrategy.cpp |
| Implementation of OneSideStrategy.
|
|
file | onesidestrategy.cpp |
| Implementation of OneSideStrategy.
|
|
file | onesidevaluestrategy.cpp |
| Implementation of OneSideStrategy.
|
|
file | threewaymerge.cpp |
| Implementation of ThreeWayMerge.
|
|