mercurial at 48982: 4 new changesets (2 on stable)

[Mercurial Commits]

4 new changesets (2 on stable) in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/9120c0cd935c
changeset:   48979:9120c0cd935c
branch:      stable
parent:      48977:bd752712ccaf
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Mon Mar 21 14:21:10 2022 -0700
summary:     unamend: abort if commit was not created by `hg [un]amend`

https://www.mercurial-scm.org/repo/hg/rev/6e7ae547e38d
changeset:   48980:6e7ae547e38d
branch:      stable
user:        Joerg Sonnenberger <joerg at bec.de>
date:        Tue Mar 22 03:19:01 2022 +0100
summary:     pullbundle: fix file name in the help text

https://www.mercurial-scm.org/repo/hg/rev/f3aafd785e65
changeset:   48981:f3aafd785e65
parent:      48978:c80544aa4971
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Tue Jan 18 13:05:21 2022 -0800
summary:     filemerge: add support for partial conflict resolution by external tool

https://www.mercurial-scm.org/repo/hg/rev/9dfbea54b680
changeset:   48982:9dfbea54b680
bookmark:    @
tag:         tip
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Thu Mar 17 11:19:06 2022 -0700
summary:     partial-merge: add support for `.args` config (`$local` etc.)

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