~toshio/bzr-gtk/handle-patch-dirty

Viewing all changes in revision 677.

  • Committer: Vincent Ladeuil
  • Date: 2010-02-24 07:47:17 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20100224074717-gac36h7b3wmhp91x
Fix 2.1.0 compatibility issue.

* diff.py:
(MergeDirectiveController.perform_merge): Fix 2.1.0 deprecation
warnings.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: