changeset 45277 | c515c54f6530 |
parent 45166 | a5be403dd7a0 |
child 45302 | fa18b02df8dd |
--- a/mercurial/mergestate.py Tue Jul 14 16:31:52 2020 +0530 +++ b/mercurial/mergestate.py Tue Jul 14 16:40:28 2020 +0530 @@ -113,8 +113,6 @@ ACTION_KEEP = b'k' ACTION_EXEC = b'e' ACTION_CREATED_MERGE = b'cm' -# GET the other/remote side and store this info in mergestate -ACTION_GET_OTHER_AND_STORE = b'gs' class mergestate(object):