Viewing all changes in revision 5662.

Committer: Canonical.com Patch Queue Manager
Date: 2011-02-12 13:59:44 UTC
mfrom: <a title="Merged From 5661.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/5661.1.1?remember=6079">(5661.1.1 missing-parent-conflicts)
Revision ID: pqm@pqm.ubuntu.com-20110212135944-g60tp8iryf0m620i

(jelmer) Add a WorkingTreeFormat.missing_parent_conflicts flag. (Jelmer
Vernooij)

added added

removed removed