Files |
file | automergestrategy.hpp |
| A strategy for taking the value of.
|
file | interactivemergestrategy.hpp |
| Interactive merge strategy asking for user input at each step.
|
file | mergeconflict.hpp |
| Models a merge conflict.
|
file | mergeconflictstrategy.hpp |
| Interface for a MergeConflictStrategy.
|
file | mergeresult.hpp |
| Class modelling the result of a three way merge.
|
file | mergetask.hpp |
| Models a merge task.
|
file | metamergestrategy.hpp |
| Applies a MergeConflictStrategy on the meta keys.
|
file | newkeystrategy.hpp |
| A strategy which always takes the value from one side.
|
file | onesidestrategy.hpp |
| A strategy which always takes the value from one side.
|
file | onesidevaluestrategy.hpp |
file | threewaymerge.hpp |
| Implements a way to build and deal with a backend.
|