mercurial at 16256: 3 new changesets (2 stable)

[Mercurial Commits]

3 new changesets (2 stable) in mercurial:

http://selenic.com/repo/hg//rev/c7eef052c9e3
changeset:   16254:c7eef052c9e3
branch:      stable
parent:      16252:cf17e76be4dd
user:        Matt Mackall <mpm at selenic.com>
date:        Tue Mar 13 15:12:26 2012 -0500
summary:     filemerge: restore default prompt for binary/symlink lost in 83925d3a4559

http://selenic.com/repo/hg//rev/ca5cc2976574
changeset:   16255:ca5cc2976574
branch:      stable
user:        Matt Mackall <mpm at selenic.com>
date:        Tue Mar 13 16:28:08 2012 -0500
summary:     merge: handle linear update to symlink correctly (issue3316)

http://selenic.com/repo/hg//rev/c655e4acaa82
changeset:   16256:c655e4acaa82
tag:         tip
parent:      16253:17f179805297
parent:      16255:ca5cc2976574
user:        Matt Mackall <mpm at selenic.com>
date:        Tue Mar 13 16:29:13 2012 -0500
summary:     merge with stable

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