Show More
@@ -41,13 +41,17 b' def _filectxorabsent(hexnode, ctx, f):' | |||||
41 | # Merge state record types. See ``mergestate`` docs for more. |
|
41 | # Merge state record types. See ``mergestate`` docs for more. | |
42 | RECORD_LOCAL = b'L' |
|
42 | RECORD_LOCAL = b'L' | |
43 | RECORD_OTHER = b'O' |
|
43 | RECORD_OTHER = b'O' | |
|
44 | # record extra information about files | |||
|
45 | RECORD_FILE_VALUES = b'f' | |||
|
46 | # record merge labels | |||
|
47 | RECORD_LABELS = b'l' | |||
|
48 | ||||
44 | RECORD_MERGED = b'F' |
|
49 | RECORD_MERGED = b'F' | |
45 | RECORD_CHANGEDELETE_CONFLICT = b'C' |
|
50 | RECORD_CHANGEDELETE_CONFLICT = b'C' | |
46 | RECORD_MERGE_DRIVER_MERGE = b'D' |
|
51 | RECORD_MERGE_DRIVER_MERGE = b'D' | |
47 | RECORD_PATH_CONFLICT = b'P' |
|
52 | RECORD_PATH_CONFLICT = b'P' | |
|
53 | ||||
48 | RECORD_MERGE_DRIVER_STATE = b'm' |
|
54 | RECORD_MERGE_DRIVER_STATE = b'm' | |
49 | RECORD_FILE_VALUES = b'f' |
|
|||
50 | RECORD_LABELS = b'l' |
|
|||
51 | RECORD_OVERRIDE = b't' |
|
55 | RECORD_OVERRIDE = b't' | |
52 | RECORD_UNSUPPORTED_MANDATORY = b'X' |
|
56 | RECORD_UNSUPPORTED_MANDATORY = b'X' | |
53 | RECORD_UNSUPPORTED_ADVISORY = b'x' |
|
57 | RECORD_UNSUPPORTED_ADVISORY = b'x' |
General Comments 0
You need to be logged in to leave comments.
Login now