Viewing all changes in revision 3744.2.1.

Committer: John Arbash Meinel
Date: 2008-09-29 22:56:44 UTC
mto: This revision was merged to the branch mainline in revision 3763 .
Revision ID: john@arbash-meinel.com-20080929225644-ke56t6jna3lmthut

Change 'bzr merge' so that it uses --reprocess as long as --show-base is not given.

added added

removed removed