Rev 1452: doc in /home/mbp/work/bzr.dev

[Martin Pool]

------------------------------------------------------------
revno: 1452
revision-id: mbp at sourcefrog.net-20051129073919-f54c6a6480761588
parent: mbp at sourcefrog.net-20051129073828-bdab256dd48bf4e8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Tue 2005-11-29 18:39:19 +1100
message:
  doc
modified:
  bzrlib/merge3.py               merge3.py-20050704130834-bf0597094828a2e1