98 CHANGE_ADDED = b'added'

    98 CHANGE_ADDED = b'added'

    99 CHANGE_REMOVED = b'removed'

    99 CHANGE_REMOVED = b'removed'

   100 CHANGE_MODIFIED = b'modified'

   100 CHANGE_MODIFIED = b'modified'

   101 

   101 

   102 

   102 

   104     """represent an "action" merge need to take for a given file

   104     """represent an "action" merge need to take for a given file

   105 

   105 

   106     Attributes:

   106     Attributes:

   107 

   107 

   108     _short: internal representation used to identify each action

   108     _short: internal representation used to identify each action

   192     ACTION_CHANGED_DELETED,

   192     ACTION_CHANGED_DELETED,

   193     ACTION_DELETED_CHANGED,

   193     ACTION_DELETED_CHANGED,

   194 )

   194 )

   195 

   195 

   196 

   196 

   198     """track 3-way merge state of individual files

   198     """track 3-way merge state of individual files

   199 

   199 

   200     The merge state is stored on disk when needed. Two files are used: one with

   200     The merge state is stored on disk when needed. Two files are used: one with

   201     an old format (version 1), and one with a new format (version 2). Version 2

   201     an old format (version 1), and one with a new format (version 2). Version 2

   202     stores a superset of the data in version 1, including new kinds of records

   202     stores a superset of the data in version 1, including new kinds of records