~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge3.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-05 21:11:28 UTC
  • mto: This revision was merged to the branch mainline in revision 3984.
  • Revision ID: john@arbash-meinel.com-20090205211128-u20k1ok49sxbrmxc
fix typo in setup.py

Show diffs side-by-side

added added

removed removed

Lines of Context: