← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 1614.2.7.

  • Committer: Olaf Conradi
  • Date: 2006-03-27 22:19:57 UTC
  • mto: (1661.1.1 bzr.mbp.remember)
  • mto: This revision was merged to the branch mainline in revision 1663.
  • Revision ID: olaf@conradi.org-20060327221957-20e59274772fbfc2
Remove exception AmbiguousBase from cmd_merge. New base selection code
does not raise it and and no test-case existed to test it.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: