~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4202.4.1.

  • Committer: Vincent Ladeuil
  • Date: 2009-03-30 08:52:39 UTC
  • mto: (4271.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 4273.
  • Revision ID: v.ladeuil+lp@free.fr-20090330085239-jrcwa0sacs0d2o55
Allow bug #348459 to be fixed externally in specific contexts.

* annotate.py:
(_annotation_tie_break): Allow external tie-breakers for parallel
modifications.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: