Rev 2375: Correctly handle empty merge directive texts in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2375
revision-id: pqm at pqm.ubuntu.com-20070324001115-e8868e5d82612556
parent: pqm at pqm.ubuntu.com-20070322230820-f8735ba918f51539
parent: aaron.bentley at utoronto.ca-20070323033701-gc7swnd0lgr0xm3a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-24 00:11:15 +0000
message:
  Correctly handle empty merge directive texts
modified:
  bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
  bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070323033701-gc7swnd0lgr0xm3a
    parent: abentley at panoramicfeedback.com-20070314152251-vvnis0udqkbv4amx
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: mergedirective-fixes
    timestamp: Thu 2007-03-22 23:37:01 -0400
    message:
      Correctly handle empty merge directive texts