mercurial/simplemerge.py

51862:607e94e01851

# along with this program; if not, see <http://www.gnu.org/licenses/>.

# mbp: "you know that thing where cvs gives you conflict markers?"
# s: "i hate that."


from .i18n import _
from . import (
    error,
    mdiff,

51863:f4733654f144

# along with this program; if not, see <http://www.gnu.org/licenses/>.

# mbp: "you know that thing where cvs gives you conflict markers?"
# s: "i hate that."

from __future__ import annotations

from .i18n import _
from . import (
    error,
    mdiff,