Comment 2 for bug 959979

Damian, this is a sign the dirstate file is truncated. You can try `bzr repair-workingtree` or make a fresh branch from the last revision and redo the merge. See the existing bug for more.