annotate mercurial-tests/testData/merge/no.subrepos/hg/undo.dirstate @ 1100:5e149d6cc0d2 release/2022.04 tip

bump log4j2 version (grafted from abd9f4f2e7b62f133f25c9cd55b21634856743ae)
author Maxim Zaytsev
date Wed, 27 Apr 2022 15:30:07 +0200
parents 7c017b6aa438
children
rev   line source
638
7c017b6aa438 Tests for merge support
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
1 (binary:application/octet-stream)