Merge lp:~eric97/bzr/fix-merge-docs into lp:bzr
Proposed by
Eric Siegerman
Status: | Merged |
---|---|
Approved by: | Martin Pool |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5554 |
Proposed branch: | lp:~eric97/bzr/fix-merge-docs |
Merge into: | lp:bzr |
Diff against target: |
42 lines (+15/-11) 1 file modified
bzrlib/builtins.py (+15/-11) |
To merge this branch: | bzr merge lp:~eric97/bzr/fix-merge-docs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pool | Approve | ||
Gordon Tyler | Approve | ||
Vincent Ladeuil | Approve | ||
Review via email: mp+40671@code.launchpad.net |
Commit message
Clarify the description of merge's "--revision" option.
Plus a drive-by fix.
Description of the change
A question came up today on the mailing list as to which merges are cherrypicks. Part of the problem is that the description of --revision is a bit muddy. This attempts to clarify that.
To post a comment you must log in.
I'm not a native English speaker, but this is far clearer to me. www.canonical. com/contributor s>.
I'm not a lawyer either so I'm not sure we need you to execute the Canonical's Contributor Agreement: <http://
But despite these hesitations, I approve this with both hands :)
We need a second reviewer still (which may not be a lawyer either but has good chances to be a native ;).