Mercurial > hg > mercurial
annotate mercurial-tests/testData/merge/no.subrepos/hg/last-message.txt @ 1124:a14a2f7e74d8 development/2024.03.x tip
2024.03.x branch is created
author | Nadia Burnasheva <nadezhda.burnasheva@jetbrains.com> |
---|---|
date | Thu, 15 Feb 2024 11:33:35 +0100 |
parents | 7c017b6aa438 |
children |
rev | line source |
---|---|
638
7c017b6aa438
Tests for merge support
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
1 create b/c conflicting with default |