|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||
| Packages that use com.aragost.javahg.merge | |
|---|---|
| com.aragost.javahg | |
| com.aragost.javahg.commands | |
| com.aragost.javahg.merge | |
| Classes in com.aragost.javahg.merge used by com.aragost.javahg | |
|---|---|
| MergeContext
|
|
| Classes in com.aragost.javahg.merge used by com.aragost.javahg.commands | |
|---|---|
| BackoutConflictResolvingContext
|
|
| GraftContext
|
|
| MergeContext
|
|
| Classes in com.aragost.javahg.merge used by com.aragost.javahg.merge | |
|---|---|
| ConflictResolvingContext
Base class for a context where conflicts are resolved. |
|
| FlagConflict
Represent a file where merge gave a flag conflict. |
|
| KeepDeleteConflict
|
|
| KeepDeleteConflict.State
|
|
| MergeConflict
|
|
| MergeFile
Base class for files somehow related to a merge. |
|
|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||