/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/conflicts.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-01-11 22:33:18 UTC
  • mfrom: (7413.8.12 probe-hg)
  • Revision ID: breezy.the.bot@gmail.com-20200111223318-r0tojy1gblgzs951
Add a Mercurial prober that mentions that mercurial repositories are unsupported.

Merged from https://code.launchpad.net/~jelmer/brz/probe-hg/+merge/375181

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/conflicts.py
27
27
import errno
28
28
 
29
29
from breezy import (
30
 
    errors,
31
30
    osutils,
32
31
    rio,
33
32
    trace,
38
37
""")
39
38
from . import (
40
39
    cache_utf8,
 
40
    errors,
41
41
    commands,
42
42
    option,
43
43
    registry,