| Trees | Indices | Help |
|
|---|
|
|
Holds classes used for resolving conflicts.
Copyright: John Stowers, 2006 License: GPLv2
|
|||
|
Conflict Represents a conflict |
|||
|
|||
log = logging.getLogger("Conflict")
|
|||
CONFLICT_ASK = 0
|
|||
CONFLICT_SKIP = 1
|
|||
CONFLICT_COPY_SOURCE_TO_SINK = 2
|
|||
CONFLICT_COPY_SINK_TO_SOURCE = 3
|
|||
CONFLICT_DELETE = 4
|
|||
| Trees | Indices | Help |
|
|---|
| Generated by Epydoc 3.0beta1 on Sat Aug 2 22:18:10 2008 | http://epydoc.sourceforge.net |