Mercurial > public > mercurial-scm > hg-stable
changeset 53024:877c20982972
branching: merge with the faulty merge
The two "identical" merge create a "criss cross" situation. We resolve it as
fast as possible.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 28 Feb 2025 23:25:42 +0100 |
parents | b12a4b9d09ce (current diff) b7afc38468bd (diff) |
children | f212c1cf38b0 |
files | contrib/heptapod-ci.yml |
diffstat | 0 files changed, 0 insertions(+), 0 deletions(-) [+] |