OpenSolaris

heads-up: hgsetup(1) changes with respect to auto-merge

Date: Thu, 22 Jan 2009 08:57:19 -0800
From: John Sonnenschein <John.Sonnenschein at sun dot com>
To: on-all at eng dot sun dot com
Subject: heads-up: hgsetup(1) changes with respect to auto-merge

As of my (or more accurately Rich Lowe's) putback of 6740762 the ~/.hgrc
created by hgsetup(1) will configure Mercurial to not auto-merge
conflicting
changes, and instead require resolution in the normal fashion.

If you wish to restore the prior behaviour (which I somewhat
discourage), you should either remove the .premerge settings in the
[merge-tools] section of your hgrc or set their values to True.

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).

For example, in the "[merge-tools]" section of your ~/.hgrc, you
could add this:

       filemerge.premerge=False
       meld.premerge=False
       gpyfm.premerge=False

-JohnS