~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2010-11-18 19:09:18 UTC
mfrom: <a title="Merged From 5540.1.7" href="/~bzr-pqm/bzr/bzr.dev/revision/5540.1.7?remember=1399.1.10">(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.

added added

removed removed