New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/cdb85d0512b8 changeset: 49224:cdb85d0512b8 bookmark: @ tag: tip user: Manuel Jacob <me at manueljacob.de> date: Wed May 25 17:23:16 2022 +0200 summary: branching: fix wrong merge conflict resolution from 13dfad0f9f7a -- Repository URL: https://www.mercurial-scm.org/repo/hg