380                 labels=self._labels,

   380                 labels=self._labels,

   381             )

   381             )

   382         if merge_ret is None:

   382         if merge_ret is None:

   383             # If return value of merge is None, then there are no real conflict

   383             # If return value of merge is None, then there are no real conflict

   384             del self._state[dfile]

   384             del self._state[dfile]

   386             self._dirty = True

   385             self._dirty = True

   387         elif not merge_ret:

   386         elif not merge_ret:

   388             self.mark(dfile, MERGE_RECORD_RESOLVED)

   387             self.mark(dfile, MERGE_RECORD_RESOLVED)

   389 

   388 

   390         if complete:

   389         if complete: