I think 'bzr help conflict-types' will tell you more in this specific case.
But I agree we could do better (which is planned so far as being part of 'bzr conflicts -v'.
I think 'bzr help conflict-types' will tell you more in this specific case.
But I agree we could do better (which is planned so far as being part of 'bzr conflicts -v'.