mercurial/mergestate.py

48761:7dad4665d223

            labels=self._labels,
        )
        if merge_ret is None:
            # If return value of merge is None, then there are no real conflict
            del self._state[dfile]
            self._dirty = True
        elif not merge_ret:
            self.mark(dfile, MERGE_RECORD_RESOLVED)

        action = None
        if deleted:
            if fcd.isabsent():

48762:d169e651066b

            labels=self._labels,
        )
        if merge_ret is None:
            # If return value of merge is None, then there are no real conflict
            del self._state[dfile]
            self._results[dfile] = None, None
            self._dirty = True
            return None

        if not merge_ret:
            self.mark(dfile, MERGE_RECORD_RESOLVED)

        action = None
        if deleted:
            if fcd.isabsent():