Rev 1469: Update comment to reflect author. in /home/robertc/source/baz/bzr-workingtree

------------------------------------------------------------
revno: 1469
revision-id: robertc at robertcollins.net-20051105221812-a2a774e6f8d993be
parent: robertc at robertcollins.net-20051105155019-a343c6aff1a8eaa0
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 17:18:12 -0500
message:
  Update comment to reflect author.
modified:
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106