mercurial at 26901: 10 new changesets

[Mercurial Commits]

10 new changesets in mercurial:

http://selenic.com/repo/hg//rev/4b966aaadc45
changeset:   26892:4b966aaadc45
parent:      26885:8b2fbe3f59b1
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Nov 08 23:47:20 2015 -0800
summary:     test-merge-types.t: add tests for :merge-local/:merge-other with symlinks

http://selenic.com/repo/hg//rev/19c4b93cb7d6
changeset:   26893:19c4b93cb7d6
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Nov 08 23:42:44 2015 -0800
summary:     filemerge: move :merge-local/other symlink check to precheck

http://selenic.com/repo/hg//rev/41957e50e109
changeset:   26894:41957e50e109
user:        Anton Shestakov <av6 at dwimlabs.net>
date:        Tue Nov 10 23:02:59 2015 +0800
summary:     hgweb: compute changeset parents and children for log pages lazily

http://selenic.com/repo/hg//rev/fc41f9ffd4a4
changeset:   26895:fc41f9ffd4a4
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Mon Nov 09 22:37:32 2015 -0800
summary:     test-merge-prompt.t: unset HGMERGE

http://selenic.com/repo/hg//rev/5e46123e6c35
changeset:   26896:5e46123e6c35
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 10 00:46:45 2015 -0800
summary:     error: add structured exception for EOF at prompt

http://selenic.com/repo/hg//rev/da1c706c9a35
changeset:   26897:da1c706c9a35
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 10 17:10:47 2015 -0800
summary:     test-merge-tools.t: add 'hg resolve --list' output to tests

http://selenic.com/repo/hg//rev/33eb8a56d0c9
changeset:   26898:33eb8a56d0c9
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 10 17:13:16 2015 -0800
summary:     filemerge: treat EOF at prompt as fail, not abort

http://selenic.com/repo/hg//rev/5f88e092f82c
changeset:   26899:5f88e092f82c
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Tue Nov 10 17:16:59 2015 -0800
summary:     resolve: don't abort when file is missing

http://selenic.com/repo/hg//rev/d1c741644d25
changeset:   26900:d1c741644d25
user:        Augie Fackler <augie at google.com>
date:        Wed Nov 04 12:14:18 2015 -0500
summary:     verify: add a hook that can let extensions manipulate file lists

http://selenic.com/repo/hg//rev/0e3d093c468e
changeset:   26901:0e3d093c468e
bookmark:    @
tag:         tip
parent:      26900:d1c741644d25
parent:      26891:a45821a808ab
user:        Matt Mackall <mpm at selenic.com>
date:        Wed Nov 11 15:08:08 2015 -0600
summary:     merge with stable

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