Comment 6 for bug 228506

I think it's extremely likely that this is bug 113809 (local commit + uncommitted change to same file can cause bzr update to double-conflict like this). The "bzr st" output from that case is identical AFAICT, and it seems like that combination of things would be pretty common if you used checkouts and local commits. So I'm going to go ahead and mark this as a duplicate. Mary, please feel free to de-dupe this bug if you disagree.