Globally disabling merge conflict resolution?

Roy Smith roy at panix.com
Sun Jan 26 15:42:41 UTC 2014


Is there some way to globally disable the default merge resolution tool in hg?  I'm talking about the thing that drops you into some bizarre three-window vi session.

We had a case recently where one of our less hg-savvy developers got a merge conflict when he did a pull.  He ended up in the vi thing, didn't know what to do, and apparently the default action when you quit vi is to resolve the merge, which was definitely not what we wanted to do.

I have:

[ui]
merge = internal:merge

in my .hgrc file, which would be fine, but that requires that everybody have that in their .hgrc file.  Is there some way to set up our central repo to globally enforce this for everybody that clones the repo?

--
Roy Smith
roy at panix.com




More information about the Mercurial mailing list