James Carlson <james.d.carlson at sun.com> writes: > 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
Will do, or cause whoever sponsors this to do. Thanks, -- Rich
