Globally disabling merge conflict resolution?

[Giovanni Gherdovich]

Hello,

>
> Is there some way to set up our central repo to
> globally enforce this for everybody that clones the repo?

Not that I know of, but you can tell people to merge with

hg merge --tool=internal:merge

instead of just relying on whatever local config they have with `hg merge`.

see `hg help mergetools` for more.

Cheers,
GGHh
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140127/7a231094/attachment-0002.html>