Bazaar

Merge lp:~benjaminp/bzr/small-fixes into lp:bzr

  1. small-fixes
  2. Merge into bzr.dev
Proposed by Benjamin Peterson
Status: Merged
Approved by: Martin Packman
Approved revision: no longer in the source branch.
Merged at revision: 6392
Proposed branch: lp:~benjaminp/bzr/small-fixes
Merge into: lp:bzr
Diff against target: 24 lines (+2/-2)
2 files modified
bzrlib/plugins/news_merge/news_merge.py (+1/-1)
bzrlib/plugins/po_merge/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~benjaminp/bzr/small-fixes
Reviewer Review Type Date Requested Status
Martin Packman (community) Approve
Review via email: mp+86474@code.launchpad.net

Commit message

Small fix to plugin docstring and formatting

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Thanks!

review: Approve
Revision history for this message
Martin Packman (gz) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/plugins/news_merge/news_merge.py'
2--- bzrlib/plugins/news_merge/news_merge.py 2011-12-19 13:23:58 +0000
3+++ bzrlib/plugins/news_merge/news_merge.py 2011-12-20 22:46:24 +0000
4@@ -30,7 +30,7 @@
5
6 def merge_text(self, params):
7 """Perform a simple 3-way merge of a bzr NEWS file.
8-
9+
10 Each section of a bzr NEWS file is essentially an ordered set of bullet
11 points, so we can simply take a set of bullet points, determine which
12 bullets to add and which to remove, sort, and reserialize.
13
14=== modified file 'bzrlib/plugins/po_merge/__init__.py'
15--- bzrlib/plugins/po_merge/__init__.py 2011-12-18 12:46:49 +0000
16+++ bzrlib/plugins/po_merge/__init__.py 2011-12-20 22:46:24 +0000
17@@ -73,7 +73,7 @@
18
19
20 def po_merge_hook(merger):
21- """Merger.merge_file_content hook for bzr-format NEWS files."""
22+ """Merger.merge_file_content hook for po files."""
23 from bzrlib.plugins.po_merge.po_merge import PoMerger
24 return PoMerger(merger)
25