Viewing all changes in revision 1711.2.66.

Committer: John Arbash Meinel
Date: 2006-06-28 13:58:43 UTC
mfrom: <a title="Merged From 1815.2.2" href="/~bzr-pqm/bzr/bzr.dev/revision/1815.2.2?remember=6170">(1815.2.2 bzr.dev)
mto: <a title="Merged In 1711.7.3" href="/~bzr-pqm/bzr/bzr.dev/revision/1711.7.3?remember=6170">(1711.7.3 win32) <a title="Merged In 1946.2.6" href="/~bzr-pqm/bzr/bzr.dev/revision/1946.2.6?remember=6170">(1946.2.6 reduce-knit-churn)
mto: This revision was merged to the branch mainline in revision 1819 .
Revision ID: john@arbash-meinel.com-20060628135843-f5edb57ece84fea5

[merge] Jelmer Vernooij: fix pending-merge exception checking

added added

removed removed