Tue, 14 Dec 2021 13:41:34 -0800 filemerge: remove leftover documentation of removed argument
Martin von Zweigbergk <martinvonz@google.com> [Tue, 14 Dec 2021 13:41:34 -0800] rev 48508
filemerge: remove leftover documentation of removed argument I removed the `premerge` argument in https://phab.mercurial-scm.org/D11859. Differential Revision: https://phab.mercurial-scm.org/D11925
Mon, 13 Dec 2021 14:44:16 -0500 merge with stable
Matt Harbison <matt_harbison@yahoo.com> [Mon, 13 Dec 2021 14:44:16 -0500] rev 48507
merge with stable
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 tip