lp:~vila/bzr/805809-no-final-path
Created by
Vincent Ladeuil
and last modified
Only
Vincent Ladeuil
can upload to this branch. If you are
Vincent Ladeuil
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- John A Meinel: Approve
-
Diff: 109 lines (+75/-2)3 files modifiedNEWS (+3/-0)
bzrlib/merge.py (+8/-2)
bzrlib/tests/test_conflicts.py (+64/-0)
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:bzr