Viewing all changes in revision 6419.

Committer: Patch Queue Manager
Date: 2012-01-03 16:52:03 UTC
mfrom: <a title="Merged From 6410.1.2" href="/~bzr-pqm/bzr/bzr.dev/revision/6410.1.2?remember=6020">(6410.1.2 bzr.dev)
Revision ID: pqm@pqm.ubuntu.com-20120103165203-ni17x57ylfpli2j0

(jelmer) Distinguish between working tree and this tree in merge. (Jelmer
Vernooij)

added added

removed removed