Turn off file content merge on pull/merge

[Martin Pool]

2010/3/25 Michael Baytalsky <mike at contextsoft.com>:
>
> Using bazaar 2.1.0 on windows.
>
> Is it possible to completely disable any content merging by bazaar?

Hi,

That would be useful to some people - it was just asked for recently
by someone else in
<https://answers.edge.launchpad.net/bzr/+question/103163>.  That
question also has an example hook to do it.  It would be nice to have
a per-file configuration to turn it off built in.  If you know Python
you might be able to finish off that code into something that can be
built in.

See also https://bugs.edge.launchpad.net/bzr/+bug/548484


-- 
Martin <http://launchpad.net/~mbp/>