← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-05-03 04:08:50 UTC
  • mfrom: (4797.43.8 2.1)
  • mto: This revision was merged to the branch mainline in revision 5199.
  • Revision ID: andrew.bennetts@canonical.com-20100503040850-wm4v7qx6wx3u7ns1
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.