/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/plugins/news_merge/__init__.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/news_merge/__init__.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
"""Merge hook for bzr's NEWS file.
 
17
__doc__ = """Merge hook for bzr's NEWS file.
18
18
 
19
19
To enable this plugin, add a section to your branch.conf or location.conf
20
20
like::
21
21
 
22
22
    [/home/user/code/bzr]
23
23
    news_merge_files = NEWS
24
 
    news_merge_files:policy = recurse
25
24
 
26
25
The news_merge_files config option takes a list of file paths, separated by
27
26
commas.