mercurial at 22675: 5 new changesets

[Mercurial Commits]

5 new changesets in mercurial:

http://selenic.com/repo/hg//rev/5220c12c43fd
changeset:   22671:5220c12c43fd
user:        Mads Kiilerich <madski at unity3d.com>
date:        Wed Oct 01 03:40:51 2014 +0200
summary:     changectx: skip all invalid merge.preferancestor values

http://selenic.com/repo/hg//rev/19903277f035
changeset:   22672:19903277f035
user:        Mads Kiilerich <madski at unity3d.com>
date:        Wed Oct 01 03:41:11 2014 +0200
summary:     merge: use bid merge by default (BC)

http://selenic.com/repo/hg//rev/16a46003b50c
changeset:   22673:16a46003b50c
user:        Mads Kiilerich <madski at unity3d.com>
date:        Wed Oct 01 03:42:00 2014 +0200
summary:     merge: mute the status message when bid merge kicks in

http://selenic.com/repo/hg//rev/06c8b58647b9
changeset:   22674:06c8b58647b9
user:        Yuya Nishihara <yuya at tcha.org>
date:        Thu Oct 02 23:20:59 2014 +0900
summary:     formatter: convert booleans to json

http://selenic.com/repo/hg//rev/4e64d255f1a8
changeset:   22675:4e64d255f1a8
tag:         tip
user:        Matt Mackall <mpm at selenic.com>
date:        Thu Oct 02 18:00:05 2014 -0500
summary:     ui: fix comment about non-interactive prompts

-- 
Repository URL: http://selenic.com/repo/hg/