~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4797.16.1.

  • Committer: Andrew Bennetts
  • Date: 2010-02-05 03:37:52 UTC
  • mto: (4797.2.14 2.1)
  • mto: This revision was merged to the branch mainline in revision 5033.
  • Revision ID: andrew.bennetts@canonical.com-20100205033752-3m6zgj9t9a58mh99
Replace many try/finally blocks in merge.py with more robust OperationWithCleanups.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: