Perforce Chronicle 2012.2/486814
API Documentation
|
A very basic interface to define the various resolve option constants. More...
Public Attributes | |
const | IGNORE_LINE_ENDINGS = 'ingoreLineEndings' |
const | IGNORE_WHITESPACE = 'ignoreWhitespace' |
const | IGNORE_WHITESPACE_CHANGES = 'ignoreWhitespaceChanges' |
const | RESOLVE_ACCEPT_FORCE = 'acceptForce' |
const | RESOLVE_ACCEPT_MERGED = 'acceptMerged' |
const | RESOLVE_ACCEPT_SAFE = 'acceptSafe' |
const | RESOLVE_ACCEPT_THEIRS = 'acceptTheirs' |
const | RESOLVE_ACCEPT_YOURS = 'acceptYours' |
A very basic interface to define the various resolve option constants.
Intended for use by P4_File and P4_Change.
const P4_ResolvableInterface::IGNORE_LINE_ENDINGS = 'ingoreLineEndings' |
const P4_ResolvableInterface::IGNORE_WHITESPACE = 'ignoreWhitespace' |
const P4_ResolvableInterface::IGNORE_WHITESPACE_CHANGES = 'ignoreWhitespaceChanges' |
const P4_ResolvableInterface::RESOLVE_ACCEPT_FORCE = 'acceptForce' |
const P4_ResolvableInterface::RESOLVE_ACCEPT_MERGED = 'acceptMerged' |
const P4_ResolvableInterface::RESOLVE_ACCEPT_SAFE = 'acceptSafe' |
const P4_ResolvableInterface::RESOLVE_ACCEPT_THEIRS = 'acceptTheirs' |
const P4_ResolvableInterface::RESOLVE_ACCEPT_YOURS = 'acceptYours' |