support --show-base for weave and lca merges
Bug #494204 reported by
John A Meinel
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Wishlist
|
Unassigned | ||
Bug Description
related to bug #40412
As part of fixing bug #40412, we now synthesize a BASE for --weave and --lca merge. We haven't hooked that up enough to actually support 'bzr merge --weave --show-base' to include the synthesized BASE lines in the inline conflict markers.
| tags: | added: check-for-breezy |
To post a comment you must log in.
