Rev 4835: (andrew) Fix example configuration in 'bzr help news_merge'. (#553161) in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.1/

------------------------------------------------------------
revno: 4835 [merge]
revision-id: pqm at pqm.ubuntu.com-20100423024000-nz2l54lvvajex20f
parent: pqm at pqm.ubuntu.com-20100422180359-1gudlxdq1q7o9ik1
parent: andrew.bennetts at canonical.com-20100422080548-rvzc461krpn1sm5p
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Fri 2010-04-23 03:40:00 +0100
message:
  (andrew) Fix example configuration in 'bzr help news_merge'. (#553161)
modified:
  bzrlib/plugins/news_merge/__init__.py __init__.py-20100113072530-qj0i1em8th5pqhat-3
=== modified file 'bzrlib/plugins/news_merge/__init__.py'
--- a/bzrlib/plugins/news_merge/__init__.py	2010-01-28 17:27:16 +0000
+++ b/bzrlib/plugins/news_merge/__init__.py	2010-04-22 08:05:48 +0000
@@ -21,7 +21,6 @@
 
     [/home/user/code/bzr]
     news_merge_files = NEWS
-    news_merge_files:policy = recurse
 
 The news_merge_files config option takes a list of file paths, separated by
 commas.