Turn off file content merge on pull/merge

[Michael Baytalsky]

Andrew,

> Not builtin, but here's a plugin that should turn it off:
> To use that,
>   1) Put that file in your plugins directory (see e.g.
>      <http://doc.bazaar.canonical.com/plugins/en/plugin-installation.html#per-user-installation>)
>   2) set "conservative_merge = true" in your configuration somewhere, e.g. in
>      your locations.conf
Thank you very much, I really appreciate the pointer!
This seem to have done it exactly the way I want it.

Would be a great plugin to include by default into installation, so that
the users could just tweak that option in the config file.

-- 
Regards,
Michael Baytalsky
Context Software LLC.
http://www.contextsoft.com
the makers of Context Database Designer