~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5954.5.1.

  • Committer: Vincent Ladeuil
  • Date: 2011-06-10 08:58:30 UTC
  • mto: (5954.4.10 merge-into-empty)
  • mto: This revision was merged to the branch mainline in revision 5968.
  • Revision ID: v.ladeuil+lp@free.fr-20110610085830-7hkx6gx220tsvfpq
Tweak comment in Merge3Merger._merge_names and the corresponding test.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: