-
Committer:
Andrew Bennetts
-
Date:
2010-01-18 07:00:11 UTC
-
mto:
(4973.1.1 integration)
-
mto:
This revision was merged to the branch mainline in
revision
4975.
-
Revision ID:
andrew.bennetts@canonical.com-20100118070011-zu374wvd0lcgai5a
Move news_merge plugin from contrib to bzrlib/plugins, change it to be enabled via a 'news_merge_files' config option, move more code out of the __init__ to minimise overhead, and add lots of docstrings, add NEWS entry.