111 ACTION_LOCAL_DIR_RENAME_GET = b'dg'

   111 ACTION_LOCAL_DIR_RENAME_GET = b'dg'

   112 ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'

   112 ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'

   113 ACTION_KEEP = b'k'

   113 ACTION_KEEP = b'k'

   114 ACTION_EXEC = b'e'

   114 ACTION_EXEC = b'e'

   115 ACTION_CREATED_MERGE = b'cm'

   115 ACTION_CREATED_MERGE = b'cm'

   118 

   116 

   119 

   117 

   120 class mergestate(object):

   118 class mergestate(object):

   121     '''track 3-way merge state of individual files

   119     '''track 3-way merge state of individual files

   122 

   120