Rev 2023: Fix deprecated use of pending_merges in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2023
revision-id: pqm at pqm.ubuntu.com-20060920135917-9b085ce8e1ba0d18
parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
parent: abentley at panoramicfeedback.com-20060919193015-77581ebc6905a473
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-20 14:59:17 +0100
message:
  Fix deprecated use of pending_merges
modified:
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060919193015-77581ebc6905a473
    parent: abentley at panoramicfeedback.com-20060919190811-73a7a2ebfc75eb19
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-09-19 15:30:15 -0400
    message:
      Fix deprecated use of pending_merges
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060919190811-73a7a2ebfc75eb19
    parent: aaron.bentley at utoronto.ca-20060906120001-b3d70c642260d590
    parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-09-19 15:08:11 -0400
    message:
      Merge bzr.dev