← 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

Merge bzr.dev into cleanup resolving conflicts

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.