175 

   175 

   176     statepathv1 = b'merge/state'

   176     statepathv1 = b'merge/state'

   177     statepathv2 = b'merge/state2'

   177     statepathv2 = b'merge/state2'

   178 

   178 

   179     @staticmethod

   179     @staticmethod

   181         """Initialize a brand new merge state, removing any existing state on

   181         """Initialize a brand new merge state, removing any existing state on

   182         disk."""

   182         disk."""

   183         ms = mergestate(repo)

   183         ms = mergestate(repo)

   184         ms.reset()

   184         ms.reset()

   186         return ms

   185         return ms

   187 

   186 

   188     @staticmethod

   187     @staticmethod

   189     def read(repo):

   188     def read(repo):

   190         """Initialize the merge state, reading it from disk."""

   189         """Initialize the merge state, reading it from disk."""