Merge lp:~spiv/bzr/fix-news-merge-help-553161 into lp:bzr/2.1

Proposed by Andrew Bennetts
Status: Merged
Merged at revision: not available
Proposed branch: lp:~spiv/bzr/fix-news-merge-help-553161
Merge into: lp:bzr/2.1
Diff against target: 11 lines (+0/-1)
1 file modified
bzrlib/plugins/news_merge/__init__.py (+0/-1)
To merge this branch: bzr merge lp:~spiv/bzr/fix-news-merge-help-553161
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+23914@code.launchpad.net

Commit message

Fix example configuration in 'bzr help news_merge'

Description of the change

Fix the example config in 'bzr help news_merge' by removing unecessary line.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

!!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/plugins/news_merge/__init__.py'
2--- bzrlib/plugins/news_merge/__init__.py 2010-01-28 17:27:16 +0000
3+++ bzrlib/plugins/news_merge/__init__.py 2010-04-22 08:09:17 +0000
4@@ -21,7 +21,6 @@
5
6 [/home/user/code/bzr]
7 news_merge_files = NEWS
8- news_merge_files:policy = recurse
9
10 The news_merge_files config option takes a list of file paths, separated by
11 commas.

Subscribers

People subscribed via source and target branches