/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/merge.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-05-29 00:23:59 UTC
  • mfrom: (7290.14.6 external-patiencediff)
  • Revision ID: breezy.the.bot@gmail.com-20190529002359-8cyjs8gq5d096ry0
Use external patiencediff.

Merged from https://code.launchpad.net/~jelmer/brz/external-patiencediff/+merge/363891

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge.py
18
18
 
19
19
from .lazy_import import lazy_import
20
20
lazy_import(globals(), """
 
21
import patiencediff
 
22
 
21
23
from breezy import (
22
24
    branch as _mod_branch,
23
25
    cleanup,
26
28
    graph as _mod_graph,
27
29
    merge3,
28
30
    osutils,
29
 
    patiencediff,
30
31
    revision as _mod_revision,
31
32
    textfile,
32
33
    trace,