Histedit shows conflicts on original repo but not on clone
问题 I want to collapse several commits into one or two in my Mercurial repository and I'm using histedit for it. Since I was not very sure how it would turn out, I've cloned my repo and tried the operation on the clone. (I've done it many times before, but this time I had some branches, and I wasn't sure how to deal with it. In the end, I've used MQ to store the branch commits while doing the collapse). Everything's worked fine, no conflicts or anything, as it should be. So I've gone and tried it