« back to all changes in this revision
Viewing changes to bzrlib/tests/per_workingtree/test_symlinks.py
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-11-18 19:09:18 UTC
- mfrom: (5540.1.7 bug483388-criss-cross-null-base)
- Revision ID: pqm@pqm.ubuntu.com-20101118190918-33ysfcqtzq6g0mki
Make merge correctly locate a lca where there is a criss-cross merge
of a new root.
of a new root.
added
removed
bzrlib/tests/per_workingtree/test_symlinks.py
