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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 18:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521181028-zn04pdfw0od9hfj3
Rename brzlib => breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_textmerge.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
#
17
17
# Author: Aaron Bentley <aaron.bentley@utoronto.ca>
18
 
from brzlib.textmerge import Merge2
19
 
from brzlib.tests import TestCase
 
18
from breezy.textmerge import Merge2
 
19
from breezy.tests import TestCase
20
20
class TestMerge2(TestCase):
21
21
    def test_agreed(self):
22
22
        lines = "a\nb\nc\nd\ne\nf\n".splitlines(True)