← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_hooks.py

  • Committer: John Arbash Meinel
  • Date: 2010-03-03 22:59:21 UTC
  • mfrom: (4797.2.24 2.1)
  • mto: (4797.2.26 2.1)
  • mto: This revision was merged to the branch mainline in revision 5075.
  • Revision ID: john@arbash-meinel.com-20100303225921-trqn6j10kabpzii6
merge 2.1, resolving NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_hooks.py
1
 
# Copyright (C) 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2007-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by