Globally disabling merge conflict resolution?

[Dave S]

Perhaps Martin and Angel's work on projrc can help.

<http://mercurial.selenic.com/wiki/ProjrcExtension>

This is not a shipped-with extension, but I think there's been some
positive reaction to it by a handful of users commenting here.

/dps



On Mon, Jan 27, 2014 at 12:36 PM, Giovanni Gherdovich <
g.gherdovich at gmail.com> wrote:

> 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
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
>


-- 
test signature -- please apply at front gate on Tuesdays only.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140127/efa5af8d/attachment-0002.html>