120 # the file is absent on the ancestor and remote side of the merge

   120 # the file is absent on the ancestor and remote side of the merge

   121 # hence this file is new and we should keep it

   121 # hence this file is new and we should keep it

   122 ACTION_KEEP_NEW = b'kn'

   122 ACTION_KEEP_NEW = b'kn'

   123 ACTION_EXEC = b'e'

   123 ACTION_EXEC = b'e'

   124 ACTION_CREATED_MERGE = b'cm'

   124 ACTION_CREATED_MERGE = b'cm'

   125 

   132 

   126 

   133 

   127 class _mergestate_base(object):

   134 class _mergestate_base(object):

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

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

   129 

   136