Show More
| @@ -159,7 +159,7 b" ACTION_REMOVE = MergeAction(b'r', narrow" | |||
|
|
159 | 159 | ACTION_ADD = MergeAction(b'a', narrow_safe=True, changes=CHANGE_ADDED) |
|
|
160 | 160 | ACTION_GET = MergeAction(b'g', narrow_safe=True, changes=CHANGE_MODIFIED) |
|
|
161 | 161 | ACTION_PATH_CONFLICT = MergeAction(b'p') |
|
|
162 | ACTION_PATH_CONFLICT_RESOLVE = MergeAction('pr') | |
|
|
162 | ACTION_PATH_CONFLICT_RESOLVE = MergeAction(b'pr') | |
|
|
163 | 163 | ACTION_ADD_MODIFIED = MergeAction( |
|
|
164 | 164 | b'am', narrow_safe=True, changes=CHANGE_ADDED |
|
|
165 | 165 | ) # not 100% about the changes value here |
General Comments 0
You need to be logged in to leave comments.
Login now