/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: Canonical.com Patch Queue Manager
  • Date: 2010-05-03 06:25:46 UTC
  • mfrom: (5197.1.1 merge-2.1-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20100503062546-wn9nc683p0m0angh
(andrew) Merge lp:bzr/2.1 into lp:bzr, including fix for #528041.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/news_merge/__init__.py
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.