mercurial at 48581: 7 new changesets (2 on stable)

[Mercurial Commits]

7 new changesets (2 on stable) in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/c852950f0e72
changeset:   48575:c852950f0e72
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Thu Jan 20 23:07:35 2022 -0800
summary:     tests: also test spaces in conflict marker labels

https://www.mercurial-scm.org/repo/hg/rev/1a84758b4fca
changeset:   48576:1a84758b4fca
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Thu Jan 20 14:46:16 2022 -0800
summary:     filemerge: remove unnecessary check for empty string

https://www.mercurial-scm.org/repo/hg/rev/62682662346c
changeset:   48577:62682662346c
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Thu Jan 20 09:04:39 2022 -0800
summary:     filemerge: make `labels` a required arg for `_premerge()`

https://www.mercurial-scm.org/repo/hg/rev/77e24ee8994b
changeset:   48578:77e24ee8994b
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Thu Jan 20 11:00:30 2022 -0800
summary:     simplemerge: take arguments as annotated context objects

https://www.mercurial-scm.org/repo/hg/rev/f970bc616ebc
changeset:   48579:f970bc616ebc
bookmark:    @
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Thu Jan 20 11:17:09 2022 -0800
summary:     filemerge: remove unused arguments from `_merge()`

https://www.mercurial-scm.org/repo/hg/rev/f1898680d713
changeset:   48580:f1898680d713
branch:      stable
parent:      48571:ccd9cb73125c
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Mon Jan 24 21:12:19 2022 -0800
summary:     tests: demonstrate how `hg unamend` fails on merge commits

https://www.mercurial-scm.org/repo/hg/rev/4f01821fa0ec
changeset:   48581:4f01821fa0ec
branch:      stable
tag:         tip
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Mon Jan 24 21:17:04 2022 -0800
summary:     unamend: error out when running on merge commit

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