Mercurial > hg

diff tests/test-bad-pull.t @ 49224:cdb85d0512b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: fix wrong merge conflict resolution from 13dfad0f9f7a 13dfad0f9f7a merged stable into default, but accidentally added the _blockingreader class from stable (but deindented) instead of merging the changes from stable (2fe4efaa59af) into the existing _blockingreader class. This resulted in the _blockingreader being there two times.
author Manuel Jacob <me@manueljacob.de>
date Wed, 25 May 2022 17:23:16 +0200
parents ebee234d952a
children
line wrap: on
line diff