mercurial at 26075: 7 new changesets

[Mercurial Commits]

7 new changesets in mercurial:

http://selenic.com/repo/hg//rev/09d6725cbc60
changeset:   26069:09d6725cbc60
user:        Erik Huelsmann <ehuels at gmail.com>
date:        Sun Aug 16 00:00:34 2015 +0200
summary:     simplemerge: add 'mode' kwarg which - when 'union' - suppresses markers

http://selenic.com/repo/hg//rev/e15966216aec
changeset:   26070:e15966216aec
user:        Erik Huelsmann <ehuels at gmail.com>
date:        Sun Aug 16 00:24:29 2015 +0200
summary:     filemerge: split internal merge into api entry point and internal helper

http://selenic.com/repo/hg//rev/ff12a6c63c3d
changeset:   26071:ff12a6c63c3d
user:        Erik Huelsmann <ehuels at gmail.com>
date:        Sun Aug 16 10:19:00 2015 +0200
summary:     filemerge: add 'union' merge to internal merge tool

http://selenic.com/repo/hg//rev/06320fb11699
changeset:   26072:06320fb11699
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Sat Aug 22 22:59:51 2015 -0700
summary:     hgweb: make refresh interval configurable

http://selenic.com/repo/hg//rev/5ef327e9c157
changeset:   26073:5ef327e9c157
user:        Augie Fackler <augie at google.com>
date:        Tue Aug 25 15:52:54 2015 -0400
summary:     progress: restore testedwith to the stub

http://selenic.com/repo/hg//rev/c1aefe57cf4e
changeset:   26074:c1aefe57cf4e
user:        Augie Fackler <augie at google.com>
date:        Fri Aug 21 14:29:42 2015 -0400
summary:     base85: fix comparison of an int and a long

http://selenic.com/repo/hg//rev/e7e7182564f6
changeset:   26075:e7e7182564f6
bookmark:    @
tag:         tip
user:        Augie Fackler <augie at google.com>
date:        Fri Aug 21 14:33:51 2015 -0400
summary:     parsers: avoid int/unsigned conversions

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