Rev 4625: test in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4625
revision-id: v.ladeuil+lp at free.fr-20100302134039-4gmkwdned2rf5vq1
parent: v.ladeuil+lp at free.fr-20100302133813-wzg3m9lqcxjskl7b
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup
timestamp: Tue 2010-03-02 14:40:39 +0100
message:
  test
-------------- next part --------------
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2010-03-02 07:58:53 +0000
+++ b/bzrlib/conflicts.py	2010-03-02 13:40:39 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
+# Copyright (C) 2005 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,6 +24,8 @@
 lazy_import(globals(), """
 import errno
 
+test update_copyright
+
 from bzrlib import (
     builtins,
     cleanup,