Using Ubuntu gutsy. I upgraded this morning to bzr 1.3. Have made several commits to my local/remote dev branch. When I tried to merge from a co-worker's branch (who upgraded to 1.3 late yesterday and committed with 1.3 the branch I am trying to merge from) I received a similar error shown below. I am trying to check with him to see what changes he may have made in the file that has the error.... adorman@andy-work2:~/programming/antespam/dev$ bzr merge bzr+ssh://