##// END OF EJS Templates
mergestate: document `o` merge record state in _mergestate_base docs...
Pulkit Goyal -
r46306:ecf6d7aa default
parent child Browse files
Show More
@@ -160,6 +160,7 b' class _mergestate_base(object):'
160 r: resolved conflict
160 r: resolved conflict
161 pu: unresolved path conflict (file conflicts with directory)
161 pu: unresolved path conflict (file conflicts with directory)
162 pr: resolved path conflict
162 pr: resolved path conflict
163 o: file was merged in favor of other parent of merge (DEPRECATED)
163
164
164 The resolve command transitions between 'u' and 'r' for conflicts and
165 The resolve command transitions between 'u' and 'r' for conflicts and
165 'pu' and 'pr' for path conflicts.
166 'pu' and 'pr' for path conflicts.
General Comments 0
You need to be logged in to leave comments. Login now