~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 2747.4.1.

  • Committer: Daniel Watkins
  • Author(s): Konstantin Mikhaylov
  • Date: 2007-08-25 16:06:25 UTC
  • mto: This revision was merged to the branch mainline in revision 2787.
  • Revision ID: d.m.watkins@warwick.ac.uk-20070825160625-txoybrl7wji18ipw
When two plugins conflict, the source of both the losing and now the winning definition is shown, fixing bug #5454.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: