~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 3450.

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-05-24 08:19:29 UTC
  • mfrom: (1551.19.44 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20080524081929-1p31juzzotqmozxu
Fix handling of old merge directives with stricter get_parent_map

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: