Viewing all changes in revision 5352.

Committer: Canonical.com Patch Queue Manager
Date: 2010-07-19 17:42:16 UTC
mfrom: <a title="Merged From 5351.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/5351.1.1?remember=6617">(5351.1.1 integration)
Revision ID: pqm@pqm.ubuntu.com-20100719174216-c1mezuulmblmnkp5

(mbp) bug 234708: An error is displayed if both --diff-options and --using
is set (Martin Pool)

added added

removed removed