Rev 2299: (mbp, r=aaron) tests for merge_modified in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2299
revision-id: pqm at pqm.ubuntu.com-20070226085224-84d4ff0445f116f8
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: mbp at sourcefrog.net-20070226044016-hp3hp0yitdt7krph
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-02-26 08:52:24 +0000
message:
  (mbp,r=aaron) tests for merge_modified
modified:
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20070226044016-hp3hp0yitdt7krph
    parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Mon 2007-02-26 15:40:16 +1100
    message:
      Add test for merge_modified