Viewing all changes in revision 3615.

Committer: Canonical.com Patch Queue Manager
Date: 2008-08-08 02:45:34 UTC
mfrom: <a title="Merged From 3588.3.2" href="/~bzr-pqm/bzr/bzr.dev/revision/3588.3.2?remember=5401">(3588.3.2 simple_annotate)
Revision ID: pqm@pqm.ubuntu.com-20080808024534-ff7wyd3vnhtpbat2

(jam) In reference to bug #232188,
always pick a revision which modified a line,
rather than a merge revision.

added added

removed removed