/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 bzrlib/tests/blackbox/test_pull.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-30 14:39:00 UTC
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120130143900-bj1io8q8dvna6sb1
Fix conflict resolution.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
581
581
            2>+N  file
582
582
            2>All changes applied successfully.
583
583
            """)
584
 
>>>>>>> MERGE-SOURCE