lp://staging/~jameinel/bzr/preview-pull-760152
Created by
John A Meinel
and last modified
Only
John A Meinel
can upload to this branch. If you are
John A Meinel
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Jelmer Vernooij (community): Approve
-
Diff: 81 lines (+25/-3)3 files modifiedbzrlib/builtins.py (+1/-1)
bzrlib/tests/blackbox/test_merge.py (+20/-2)
doc/en/release-notes/bzr-2.3.txt (+4/-0)
Related source package recipes
Related bugs
Related blueprints
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/bzr
