Rev 1911: Merge takes --uncommitted parameter in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1911
revision-id: pqm at pqm.ubuntu.com-20060809170522-28c918e7d93365fe
parent: pqm at pqm.ubuntu.com-20060808002438-4b8baf2d9282e154
parent: abentley at panoramicfeedback.com-20060809164210-3945898670a299ca
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-08-09 18:05:22 +0100
message:
  Merge takes --uncommitted parameter
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060809164210-3945898670a299ca
    parent: pqm at pqm.ubuntu.com-20060808002438-4b8baf2d9282e154
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: merge-uncommitted
    timestamp: Wed 2006-08-09 12:42:10 -0400
    message:
      Merge takes --uncommitted parameter