Rev 1454: Remove dead Weave.merge() method (use weave_merge instead) in /home/mbp/work/bzr.dev

[Martin Pool]

------------------------------------------------------------
revno: 1454
revision-id: mbp at sourcefrog.net-20051129100414-54250ca617c5252c
parent: mbp at sourcefrog.net-20051129075836-3623cd52d08943e4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 21:04:14 +1100
message:
  Remove dead Weave.merge() method (use weave_merge instead)
modified:
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b