/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/tests/test_multiparent.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/tests/test_multiparent.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
import patiencediff
17
18
from unittest import TestCase
18
19
 
19
20
from .. import (
20
21
    multiparent,
21
 
    patiencediff,
22
22
    tests,
23
23
    )
24
24
from ..sixish import int2byte