Comment 1 for bug 548484

See recent thread "Turn off file content merge on pull/merge"

----
Is it possible to completely disable any content merging by bazaar?

I'd very much prefer if it would require me to merge manually if ANY
conflict in the content occurs. We had some problems recently with
it merging automatically two corrected files resulting in loosing
my local tested copy of work - because instead of reporting a
conflict it merged in somebody's else changes, which partly
duplicated my work.

There's no way to tell it NOT to merge contents of text files during
pull and this is sort of scary, because it require to check manually
the content of all pulled files which were automatically merged.

Also, I've seen a couple of articles recently on how 3-way merging
can be harmful. So... would be nice to be able to turn it off completely.