mercurial at 26953: 7 new changesets

[Mercurial Commits]

7 new changesets in mercurial:

http://selenic.com/repo/hg//rev/fdfc50d09e8d
changeset:   26947:fdfc50d09e8d
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Wed Nov 11 17:32:41 2015 -0800
summary:     test-merge-prompt.t: rename to test-merge-changedelete.t

http://selenic.com/repo/hg//rev/067ab07435c9
changeset:   26948:067ab07435c9
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Wed Nov 11 17:34:28 2015 -0800
summary:     filemerge: rename _symlinkcheck to _mergecheck

http://selenic.com/repo/hg//rev/b639b2f186bf
changeset:   26949:b639b2f186bf
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Thu Nov 12 14:29:02 2015 -0800
summary:     merge.applyupdates: only attempt to merge files in mergeactions

http://selenic.com/repo/hg//rev/6686ae524f94
changeset:   26950:6686ae524f94
user:        Matt Harbison <matt_harbison at yahoo.com>
date:        Mon Nov 09 12:49:31 2015 -0500
summary:     tests: make 'f' tool open files in binary mode when hexdumping

http://selenic.com/repo/hg//rev/af1ae4ee755c
changeset:   26951:af1ae4ee755c
user:        Matt Harbison <matt_harbison at yahoo.com>
date:        Mon Nov 09 12:51:58 2015 -0500
summary:     test-largefiles-cache: add glob for Windows

http://selenic.com/repo/hg//rev/4e566f513fd8
changeset:   26952:4e566f513fd8
user:        Matt Harbison <matt_harbison at yahoo.com>
date:        Mon Nov 09 13:12:35 2015 -0500
summary:     tests: tolerate differences between Linux and Windows error strings

http://selenic.com/repo/hg//rev/2da6a2dbfc42
changeset:   26953:2da6a2dbfc42
bookmark:    @
tag:         tip
user:        Matt Harbison <matt_harbison at yahoo.com>
date:        Mon Nov 09 17:20:50 2015 -0500
summary:     test-fileset: glob the updated file count for Windows stability

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