~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: John Arbash Meinel
  • Date: 2008-10-02 15:36:12 UTC
  • mto: This revision was merged to the branch mainline in revision 3762.
  • Revision ID: john@arbash-meinel.com-20081002153612-nmrpqm17n8bunfrv
Request from Martin, clearly comment the problem.
Request from Robert, only blacklist the one known-bad version of pyrex.

Show diffs side-by-side

added added

removed removed

Lines of Context: