mercurial at 48971: 6 new changesets (3 on stable)

[Mercurial Commits]

6 new changesets (3 on stable) in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/b10a944c0486
changeset:   48966:b10a944c0486
branch:      stable
parent:      48964:9ce563fb2989
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Tue Mar 15 13:40:45 2022 -0700
summary:     tests: demonstrate how conflict markers end up $local *and* $output

https://www.mercurial-scm.org/repo/hg/rev/a54a866349ed
changeset:   48967:a54a866349ed
branch:      stable
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Tue Mar 15 13:31:39 2022 -0700
summary:     filemerge: when merge tool uses $output, don't leave markers in $local

https://www.mercurial-scm.org/repo/hg/rev/4a8eff64860a
changeset:   48968:4a8eff64860a
branch:      stable
user:        Julien Cristau <jcristau at debian.org>
date:        Tue Mar 15 14:45:47 2022 +0100
summary:     test: update test-clone-stream.t to pass on bigendian

https://www.mercurial-scm.org/repo/hg/rev/f64bbba2ee59
changeset:   48969:f64bbba2ee59
parent:      48965:a82f5d2b48fb
user:        pacien <pacien.trangirard at pacien.net>
date:        Thu Mar 17 11:00:05 2022 +0100
summary:     tests: fix glob pattern for dynamic timer alignment

https://www.mercurial-scm.org/repo/hg/rev/890db1c97218
changeset:   48970:890db1c97218
user:        Julien Cristau <jcristau at debian.org>
date:        Tue Mar 15 10:36:28 2022 +0100
summary:     revlog: fix index_fast_rank (wip)

https://www.mercurial-scm.org/repo/hg/rev/4057563ebc6b
changeset:   48971:4057563ebc6b
bookmark:    @
tag:         tip
parent:      48970:890db1c97218
parent:      48968:4a8eff64860a
user:        Raphaël Gomès <rgomes at octobus.net>
date:        Thu Mar 17 12:27:40 2022 +0100
summary:     branching: merge stable into default

-- 
Repository URL: https://www.mercurial-scm.org/repo/hg