Merge lp:~gz/bzr/2.5_2.4_integration into lp:bzr/2.5
Proposed by
Martin Packman
Status: | Merged |
---|---|
Approved by: | Martin Packman |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6508 |
Proposed branch: | lp:~gz/bzr/2.5_2.4_integration |
Merge into: | lp:bzr/2.5 |
Diff against target: |
129 lines (+24/-20) 6 files modified
INSTALL (+1/-3) bzrlib/builtins.py (+3/-2) bzrlib/tests/blackbox/test_testament.py (+11/-0) doc/developers/code-style.txt (+3/-12) doc/en/admin-guide/introduction.txt (+2/-3) doc/en/release-notes/bzr-2.4.txt (+4/-0) |
To merge this branch: | bzr merge lp:~gz/bzr/2.5_2.4_integration |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
bzr-core | Pending | ||
Review via email: mp+122919@code.launchpad.net |
Commit message
Merge 2.4 into 2.5
To post a comment you must log in.
With the correct merge target this time...