~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 1551.19.44.

  • Committer: Aaron Bentley
  • Date: 2008-05-23 21:45:50 UTC
  • mto: This revision was merged to the branch mainline in revision 3450.
  • Revision ID: aaron@aaronbentley.com-20080523214550-am926ey6mus29bu9
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: