|
||||||||||
PREV PACKAGE NEXT PACKAGE | FRAMES NO FRAMES |
Class Summary | |
---|---|
BackoutConflictResolvingContext | |
ConflictResolvingContext | Base class for a context where conflicts are resolved. |
FlagConflict | Represent a file where merge gave a flag conflict. |
GraftContext | |
KeepDeleteConflict | |
MergeConflict | |
MergeContext | |
MergeFile | Base class for files somehow related to a merge. |
Enum Summary | |
---|---|
KeepDeleteConflict.State |
|
||||||||||
PREV PACKAGE NEXT PACKAGE | FRAMES NO FRAMES |