Rev 1436: Better exception for one unhandled merge case in /home/mbp/work/bzr.dev

------------------------------------------------------------
revno: 1436
revision-id: mbp at sourcefrog.net-20051124022811-add704653e62d42b
parent: mbp at sourcefrog.net-20051124014111-b73f6da5f344f5ce
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 13:28:11 +1100
message:
  Better exception for one unhandled merge case
modified:
  bzrlib/changeset.py            changeset.py-20050513021216-b02ab57fb9738913