>>>>> Alexander Belchenko <bialix at ukr.net> writes:
<snip/>
> It's applicable to contents conflicts, which either for binary files
> or... hmm I don't remember what is another case for getting contents
> conflict.
Try 'bzr help conflict-types' to refresh your otherwise very good
understanding ;)
Vincent