Rev 1758: Fix regression in LocalTransport to allow merging. in /home/robertc/source/baz/integration/

[Robert Collins]

------------------------------------------------------------
revno: 1758
revision-id: robertc at robertcollins.net-20060609095744-784f9e971ed88ffc
parent: robertc at robertcollins.net-20060609091856-2f9fc48998d655a9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-06-09 19:57:44 +1000
message:
  Fix regression in LocalTransport to allow merging.
modified:
  bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24