Viewing all changes in revision 4146.

Committer: Canonical.com Patch Queue Manager
Date: 2009-03-16 03:30:45 UTC
mfrom: (4142.1.1 merge)
Revision ID: pqm@pqm.ubuntu.com-20090316033045-cs5dvs2r9xjmqirh

(robertc) Fix a regression in merge where --force was ignored.
(Robert Collins)

added added

removed removed