Richard Lowe writes:
> Please review:
> 6740762 hgsetup should configure filemerge.premerge = false
>
> webrev:
> http://cr.opensolaris.org/~richlowe/onnv_6740762
That seems simple enough.
> If this change is seen as requiring a heads-up be sent to on-discuss
> (I don't know), its contents should approximate:
The heads-up looks ok.
> If you have an existing hgrc but wish to prevent auto-merge, you
> should set .premerge=False in that section for each tool (you can use
> the hgrc created by hgsetup(1) as an example).
I'd give a concrete example (because I'm sure someone will try that
text literally):
For example, in the "[merge-tools]" section of your ~/.hgrc, you
could add this:
filemerge.premerge=False
meld.premerge=False
gpyfm.premerge=False
--
James Carlson, Solaris Networking <james.d.carlson at sun.com>
Sun Microsystems / 35 Network Drive 71.232W Vox +1 781 442 2084
MS UBUR02-212 / Burlington MA 01803-2757 42.496N Fax +1 781 442 1677
